Removed swagger module and updated dependencies.

noboomu · Nov 20, 2020 · 9992239 · 9992239
1 parent 5b1ff1d
commit 9992239
Show file tree

Hide file tree

Showing 32 changed files with 55 additions and 15,383 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ Proteus Changelog.
 ## Unreleased
 ### No issue
 
+**Async service timeouts.**
+
+
+[5b1ff1de664b009](https://github.com/noboomu/proteus/commit/5b1ff1de664b009) Joshua Bauer *2020-11-20 01:22:12*
+
 **Controllers are now compiled in parallel.**
 
 

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,6 @@
 
     <modules>
         <module>proteus-core</module>
-        <module>proteus-swagger</module>
         <module>proteus-openapi</module>
     </modules>
 
@@ -40,40 +39,41 @@
   </scm>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <undertow.version>2.1.0.Final</undertow.version>
-        <jackson.version>2.9.8</jackson.version>
-        <guava.version>28.1-jre</guava.version>
-        <guice.version>4.2.2</guice.version>
-        <typesafe-config.version>1.3.3</typesafe-config.version>
-        <snakeyaml.version>1.25</snakeyaml.version>
-        <commons-io.version>2.6</commons-io.version>
-        <slf4j.version>1.7.30</slf4j.version>
-        <openhft-compiler.version>2.3.1</openhft-compiler.version>
+
+        <changelog.version>1.60</changelog.version>
+        <commons-io.version>2.8.0</commons-io.version>
+        <commons-lang3.version>3.11</commons-lang3.version>
+        <guava.version>30.0-jre</guava.version>
+        <guice.version>4.2.3</guice.version>
+        <httpcore.version>4.4.13</httpcore.version>
+        <jackson.version>2.11.3</jackson.version>
         <jakarta-ws-rs.version>2.1.6</jakarta-ws-rs.version>
         <jansi.version>1.18</jansi.version>
-        <woodstox.version>6.0.3</woodstox.version>
-        <commons-lang3.version>3.9</commons-lang3.version>
         <javapoet.version>1.11.1</javapoet.version>
-        <reflections.version>0.9.12</reflections.version>
-        <httpcore.version>4.4.12</httpcore.version>
         <logback-classic.version>1.2.3</logback-classic.version>
-        <openapi.version>2.0.6</openapi.version>
-        <swagger.version>1.5.21</swagger.version>
-        <changelog.version>1.60</changelog.version>
-        <proteus.version>${project.version}</proteus.version>
-        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
-        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
-        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
-        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
-        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
+        <maven-javadoc-plugin.version>3.1.1</maven-javadoc-plugin.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
-        <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+        <maven-shade-plugin.version>3.2.1</maven-shade-plugin.version>
+        <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
+        <maven.compiler.source>12</maven.compiler.source>
+        <maven.compiler.target>12</maven.compiler.target>
+        <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <openapi.version>2.1.5</openapi.version>
+        <openhft-compiler.version>2.3.1</openhft-compiler.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <proteus.version>${project.version}</proteus.version>
+        <reflections.version>0.9.12</reflections.version>
+        <slf4j.version>1.7.30</slf4j.version>
+        <snakeyaml.version>1.25</snakeyaml.version>
+        <swagger.version>1.5.21</swagger.version>
+        <typesafe-config.version>1.3.3</typesafe-config.version>
+        <undertow.version>2.1.0.Final</undertow.version>
+        <woodstox.version>6.0.3</woodstox.version>
 
     </properties>
 

diff --git a/proteus-core/pom.xml b/proteus-core/pom.xml
@@ -192,18 +192,26 @@ Proteus Changelog.
             <version>${javapoet.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <version>${guice.version}</version>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
             <version>${guava.version}</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>${guice.version}</version>
+            <exclusions>
+                  <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <dependency>
             <groupId>com.typesafe</groupId>
             <artifactId>config</artifactId>

diff --git a/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java b/proteus-core/src/main/java/io/sinistral/proteus/ProteusApplication.java
@@ -246,7 +246,7 @@ public void failure(Service service)
 
         try
         {
-            serviceManager.startAsync().awaitHealthy(120L, TimeUnit.SECONDS);
+            serviceManager.startAsync().awaitHealthy(config.getDuration("application.services.timeout"));
         } catch( Exception e )
         {
             log.error("Failed start to services within 2 minutes",e);
@@ -289,6 +289,8 @@ public void buildServer()
 
         CopyOnWriteArrayList<Class<? extends Supplier<RoutingHandler>>> routerClasses = new CopyOnWriteArrayList<>();
 
+        log.info("Generating route handlers...");
+
         for (Class<?> controllerClass : registeredControllers)
         {
 
@@ -333,6 +335,8 @@ public void buildServer()
 
         this.addDefaultRoutes(router);
 
+        log.info("Route handlers generated");
+
         HttpHandler handler;
 
         if (rootHandlerClass != null)

diff --git a/proteus-core/src/main/resources/reference.conf b/proteus-core/src/main/resources/reference.conf
@@ -29,6 +29,10 @@ application {
 
   # path to default favicon file
   favicon = "/io/sinistral/proteus/favicon.ico"
+
+  services {
+    timeout = 2 minutes
+  }
 
 }
 

diff --git a/...enapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java b/...enapi/src/test/java/io/sinistral/proteus/openapi/test/converters/MoneyModelConverter.java
@@ -139,13 +139,7 @@ public int hashCode()
          * Convert the given object to string with each line indented by 4 spaces
          * (except the first line).
          */
-        private String toIndentedString(java.lang.Object o)
-        {
-            if (o == null) {
-                return "null";
-            }
-            return o.toString().replace("\n", "\n    ");
-        }
+
 
     }
 }
diff --git a/proteus-swagger/pom.xml b/proteus-swagger/pom.xml