Tidy tests only

Author: rbygrave

http-generator-jex/src/main/java/io/avaje/http/generator/jex/ControllerWriter.java

@@ -8,7 +8,7 @@
 import java.io.IOException;
 
 /**
- * Write Javalin specific Controller WebRoute handling adapter.
+ * Write Jex specific Controller WebRoute handling adapter.
  */
 class ControllerWriter extends BaseControllerWriter {
 

tests/test-helidon/src/main/java/org/example/Main.java

@@ -4,7 +4,6 @@
 import io.helidon.health.HealthSupport;
 import io.helidon.media.jackson.JacksonSupport;
 import io.helidon.metrics.MetricsSupport;
-import io.helidon.webserver.FormParamsSupport;
 import io.helidon.webserver.Routing;
 import io.helidon.webserver.Service;
 import io.helidon.webserver.WebServer;
@@ -53,7 +52,8 @@ static WebServer startServer(int port) {
   private static Routing createRouting() {
 
     final Routing.Builder builder = Routing.builder()
-      .register(FormParamsSupport.create())
+      //.register(FormParamsSupport.create())
+      //.register( DefaultMediaSupport.formParamReader())
       .register(HealthSupport.create())
       .register(MetricsSupport.create())
       .register("/greet", new GreetService());

tests/test-jex/pom.xml

@@ -16,7 +16,7 @@
 
   <properties>
     <main.class>org.example.myapp.Main</main.class>
-    <jex.version>1.2</jex.version>
+    <jex.version>1.3</jex.version>
     <swagger.version>2.0.8</swagger.version>
     <jackson.version>2.12.3</jackson.version>
     <avaje-http-version>1.4-SNAPSHOT</avaje-http-version>
@@ -94,7 +94,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
 
@@ -122,7 +122,7 @@
       <plugin>
         <groupId>io.repaint.maven</groupId>
         <artifactId>tiles-maven-plugin</artifactId>
-        <version>2.17</version>
+        <version>2.19</version>
         <extensions>true</extensions>
         <configuration>
           <tiles>

tests/test-jex/src/main/java/org/example/Main.java

@@ -5,23 +5,19 @@
 import io.avaje.jex.Jex;
 import io.avaje.jex.Routing;
 
-import java.util.List;
-
 public class Main {
 
   public static void main(String[] args) {
-
     start(8090);
   }
 
   public static Jex.Server start(int port) {
-    final Jex jex = Jex.create();
-
-    final Routing routing = jex.routing();
-    final BeanContext context = SystemContext.context();
-    final List<Routing.Service> beans = context.getBeans(Routing.Service.class);
-    beans.forEach(service -> service.add(routing));
+    return start(port, SystemContext.context());
+  }
 
+  public static Jex.Server start(int port, BeanContext context) {
+    final Jex jex = Jex.create();
+    jex.routing().addAll(context.getBeans(Routing.Service.class));
     return jex.port(port).start();
   }
 }

tests/test-jex/src/test/java/org/example/web/BaseWebTest.java

@@ -31,7 +31,6 @@ public static HttpClientContext client() {
       .withBaseUrl(baseUrl)
       .withResponseListener(new RequestLogger())
       .withBodyAdapter(new JacksonBodyAdapter(new ObjectMapper()))
-      //.with(httpClient)
       .build();
   }
 }