Merge pull request #200 from scalecube/cleanup

scalecube · Sep 30, 2022 · 10ca1ca · 10ca1ca
2 parents a404fce + 967a501
commit 10ca1ca
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 1,406 deletions.
diff --git a/config-examples/pom.xml b/config-examples/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <parent>
     <groupId>io.scalecube</groupId>
@@ -10,35 +12,12 @@
 
   <artifactId>scalecube-config-examples</artifactId>
 
-  <properties>
-    <log4j.version>2.17.1</log4j.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.scalecube</groupId>
       <artifactId>scalecube-config</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-config-mongo</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>io.scalecube</groupId>
-      <artifactId>scalecube-config-http-server</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-slf4j-impl</artifactId>
-      <version>${log4j.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.logging.log4j</groupId>
-      <artifactId>log4j-core</artifactId>
-      <version>${log4j.version}</version>
-    </dependency>
   </dependencies>
+
 </project>
diff --git a/config-examples/src/main/java/io/scalecube/config/examples/ConfigRegistryExample.java b/config-examples/src/main/java/io/scalecube/config/examples/ConfigRegistryExample.java
@@ -4,7 +4,6 @@
 import io.scalecube.config.ConfigRegistrySettings;
 import io.scalecube.config.StringConfigProperty;
 import io.scalecube.config.audit.Slf4JConfigEventListener;
-import io.scalecube.config.http.server.ConfigRegistryHttpServer;
 import io.scalecube.config.source.ClassPathConfigSource;
 import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.nio.file.Path;
@@ -37,8 +36,5 @@ public static void main(String[] args) {
     StringConfigProperty orderedProp1 = configRegistry.stringProperty("orderedProp1");
 
     System.out.println("### Matched by first predicate orderedProp1=" + orderedProp1.value().get());
-
-    // Start REST HTTP Server
-    ConfigRegistryHttpServer.create(configRegistry, 5050);
   }
 }
diff --git a/config-examples/src/main/java/io/scalecube/config/examples/DemoConfig.java b/config-examples/src/main/java/io/scalecube/config/examples/DemoConfig.java
@@ -4,11 +4,6 @@
 import io.scalecube.config.ConfigRegistrySettings;
 import io.scalecube.config.StringConfigProperty;
 import io.scalecube.config.audit.Slf4JConfigEventListener;
-import io.scalecube.config.http.server.ConfigRegistryHttpServer;
-import io.scalecube.config.keyvalue.KeyValueConfigSource;
-import io.scalecube.config.mongo.MongoConfigConnector;
-import io.scalecube.config.mongo.MongoConfigEventListener;
-import io.scalecube.config.mongo.MongoConfigRepository;
 import io.scalecube.config.source.FileDirectoryConfigSource;
 import java.nio.file.Path;
 import java.util.function.Predicate;
@@ -28,14 +23,6 @@ public static void main(String[] args) {
     String configSourceCollectionName = "MongoConfigRepository";
     String auditLogCollectionName = "TestConfigurationAuditLog";
 
-    MongoConfigConnector connector = MongoConfigConnector.builder().forUri(uri).build();
-
-    KeyValueConfigSource mongoConfigSource =
-        KeyValueConfigSource.withRepository(
-                new MongoConfigRepository(connector), configSourceCollectionName)
-            .groups("group2", "group1", "root")
-            .build();
-
     // Local resource cfg source init
     Predicate<Path> propsPredicate = path -> path.toString().endsWith(".props");
     String basePath = "config-examples/config";
@@ -46,9 +33,7 @@ public static void main(String[] args) {
             ConfigRegistrySettings.builder()
                 .addLastSource(
                     "ConfigDirectory", new FileDirectoryConfigSource(basePath, propsPredicate))
-                .addLastSource("MongoConfig", mongoConfigSource)
                 .addListener(new Slf4JConfigEventListener())
-                .addListener(new MongoConfigEventListener(connector, auditLogCollectionName))
                 .keepRecentConfigEvents(10)
                 .reloadIntervalSec(3)
                 .jmxEnabled(true)
@@ -57,9 +42,6 @@ public static void main(String[] args) {
 
     // Inject cfgReg into target component
     SomeComponent component = new SomeComponent(configRegistry);
-
-    // Start REST HTTP Server
-    ConfigRegistryHttpServer.create(configRegistry, 5050);
   }
 
   static class SomeComponent {

diff --git a/config-examples/src/main/java/io/scalecube/config/examples/JsonObjectExample.java b/config-examples/src/main/java/io/scalecube/config/examples/JsonObjectExample.java
diff --git a/config-examples/src/main/java/io/scalecube/config/examples/MongoConfigExample.java b/config-examples/src/main/java/io/scalecube/config/examples/MongoConfigExample.java
diff --git a/config-http-server/pom.xml b/config-http-server/pom.xml
diff --git a/...g-http-server/src/main/java/io/scalecube/config/http/server/ConfigRegistryHttpServer.java b/...g-http-server/src/main/java/io/scalecube/config/http/server/ConfigRegistryHttpServer.java