Merge pull request #37 from appform-io/ft_hub_server

Moved to consolidated hub server
appform-io · Jun 14, 2024 · 936c214 · 936c214
2 parents dbfe4da + 395b134
commit 936c214
Show file tree

Hide file tree

Showing 30 changed files with 585 additions and 607 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,12 +22,9 @@
         <module>ranger-http-client</module>
         <module>ranger-server-common</module>
         <module>ranger-server-bundle</module>
-        <module>ranger-zk-server</module>
-        <module>ranger-http-server</module>
         <module>ranger-http-model</module>
-        <module>ranger-http-server-bundle</module>
-        <module>ranger-zk-server-bundle</module>
-        <module>ranger-discovery-bundle</module>
+        <module>ranger-hub-server-bundle</module>
+        <module>ranger-server</module>
     </modules>
 
     <distributionManagement>
@@ -241,7 +238,7 @@
             <plugin>
                 <groupId>org.sonatype.plugins</groupId>
                 <artifactId>nexus-staging-maven-plugin</artifactId>
-                <version>1.6.13</version>
+                <version>1.7.0</version>
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>

diff --git a/.../perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json b/.../perf/results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerate.json
@@ -4,5 +4,5 @@
   "iterations" : 4,
   "threads" : 1,
   "forks" : 3,
-  "mean_ops" : 773920.400092714
+  "mean_ops" : 763105.9286163104
 }
diff --git a/...results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json b/...results/io.appform.ranger.discovery.bundle.id.IdGeneratorPerfTest.testGenerateBase36.json
@@ -4,5 +4,5 @@
   "iterations" : 4,
   "threads" : 1,
   "forks" : 3,
-  "mean_ops" : 600324.2457100645
+  "mean_ops" : 608727.2211847006
 }
diff --git a/...overy-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java b/...overy-bundle/src/main/java/io/appform/ranger/discovery/bundle/ServiceDiscoveryBundle.java
@@ -246,7 +246,7 @@ private RangerClient<ShardInfo, MapBasedServiceRegistry<ShardInfo>> buildDiscove
                                 .readValue(data, new TypeReference<ServiceNode<ShardInfo>>() {
                                 });
                     } catch (IOException e) {
-                        log.warn("Error parsing node data with value {}", new String(data));
+                        log.warn("Error parsing node data with value {} for service: {}", new String(data), serviceName);
                     }
                     return null;
                 })

diff --git a/ranger-http-server-bundle/pom.xml b/ranger-http-server-bundle/pom.xml
diff --git a/...tp-server-bundle/src/main/java/io/appform/ranger/http/server/bundle/HttpServerBundle.java b/...tp-server-bundle/src/main/java/io/appform/ranger/http/server/bundle/HttpServerBundle.java
diff --git a/...le/src/main/java/io/appform/ranger/http/server/bundle/config/RangerHttpConfiguration.java b/...le/src/main/java/io/appform/ranger/http/server/bundle/config/RangerHttpConfiguration.java
diff --git a/ranger-http-server/config/local.yml b/ranger-http-server/config/local.yml
diff --git a/ranger-http-server/pom.xml b/ranger-http-server/pom.xml
diff --git a/ranger-http-server/src/main/java/io/appform/ranger/http/server/App.java b/ranger-http-server/src/main/java/io/appform/ranger/http/server/App.java
diff --git a/ranger-hub-server-bundle/pom.xml b/ranger-hub-server-bundle/pom.xml
@@ -0,0 +1,59 @@
+<?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">
+    <parent>
+        <artifactId>ranger</artifactId>
+        <groupId>io.appform.ranger</groupId>
+        <version>1.0-RC18</version>
+    </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ranger-hub-server-bundle</artifactId>
+
+    <properties>
+        <dropwizard.version>2.0.23</dropwizard.version>
+    </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.appform.ranger</groupId>
+      <artifactId>ranger-http-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.appform.ranger</groupId>
+      <artifactId>ranger-zk-client</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.appform.ranger</groupId>
+      <artifactId>ranger-server-bundle</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.appform.ranger</groupId>
+      <artifactId>ranger-server-common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.dropwizard</groupId>
+      <artifactId>dropwizard-core</artifactId>
+      <version>${dropwizard.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+
+</project>