Rename jooby.route to jooby.use

jknack · jknack · commit 154dbb6d49e4 · 2014-10-09T20:33:36.000-03:00
diff --git a/jooby-core/src/main/java/jooby/Jooby.java b/jooby-core/src/main/java/jooby/Jooby.java
@@ -619,7 +619,7 @@ public Route.Definition assets(final String path) {
    *
    * @param routeType The Mvc route.
    */
-  public void route(final Class<?> routeType) {
+  public void use(final Class<?> routeType) {
     requireNonNull(routeType, "Route type is required.");
     if (routeType.getAnnotation(javax.inject.Singleton.class) == null) {
       protoRoutes.add(routeType);
diff --git a/jooby-tests/src/test/java/jooby/CharsetFeature.java b/jooby-tests/src/test/java/jooby/CharsetFeature.java
@@ -43,7 +43,7 @@ public String locale(final jooby.Request req) {
 
   {
     use(ConfigFactory.empty().withValue("application.charset", ConfigValueFactory.fromAnyRef(Charsets.ISO_8859_1.name())));
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ConfigPropertiesFeature.java b/jooby-tests/src/test/java/jooby/ConfigPropertiesFeature.java
@@ -75,7 +75,7 @@ public Object letter() {
   }
 
   {
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ContentNegotiationFeature.java b/jooby-tests/src/test/java/jooby/ContentNegotiationFeature.java
@@ -67,7 +67,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
         .produces(MediaType.json)
         .consumes(MediaType.json);
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   private static final String CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8";
diff --git a/jooby-tests/src/test/java/jooby/DateTimeFormatterFeature.java b/jooby-tests/src/test/java/jooby/DateTimeFormatterFeature.java
@@ -51,7 +51,7 @@ public String formatter(final long time, final jooby.Request req) {
   {
     use(ConfigFactory.empty().withValue("application.lang",
         ConfigValueFactory.fromAnyRef("en_US")));
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ExceptionHandlingFeature.java b/jooby-tests/src/test/java/jooby/ExceptionHandlingFeature.java
@@ -39,7 +39,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
 
     get("/error", (req, resp) -> resp.send(null));
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   private static final String CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8";
diff --git a/jooby-tests/src/test/java/jooby/FormParamFeature.java b/jooby-tests/src/test/java/jooby/FormParamFeature.java
@@ -28,7 +28,7 @@ public String text(final String name, final int age) {
       resp.send(name + " " + age);
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/HeaderParamFeature.java b/jooby-tests/src/test/java/jooby/HeaderParamFeature.java
@@ -63,7 +63,7 @@ public Object enumHeader(@Header final VOWELS h) {
   }
 
   {
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/LocaleFeature.java b/jooby-tests/src/test/java/jooby/LocaleFeature.java
@@ -38,7 +38,7 @@ public String locale(final jooby.Request req) {
 
   {
     use(ConfigFactory.empty().withValue("application.lang", ConfigValueFactory.fromAnyRef("es_ar")));
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ModulePropertiesFeature.java b/jooby-tests/src/test/java/jooby/ModulePropertiesFeature.java
@@ -61,7 +61,7 @@ public Object property() {
 
     use(new M1());
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/MultipartFormParamFeature.java b/jooby-tests/src/test/java/jooby/MultipartFormParamFeature.java
@@ -82,7 +82,7 @@ public String optional(final Optional<Upload> upload) throws IOException {
       }
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/MvcMethodWithMultipleVerbsFeature.java b/jooby-tests/src/test/java/jooby/MvcMethodWithMultipleVerbsFeature.java
@@ -24,7 +24,7 @@ public String getOrPost(final jooby.Request req) {
   }
 
   {
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/MvcNoContentFeature.java b/jooby-tests/src/test/java/jooby/MvcNoContentFeature.java
@@ -21,7 +21,7 @@ public void noContent() {
   }
 
   {
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/NumberFormatterFeature.java b/jooby-tests/src/test/java/jooby/NumberFormatterFeature.java
@@ -47,7 +47,7 @@ public String formatter() {
     use(ConfigFactory.empty().withValue("application.lang",
         ConfigValueFactory.fromAnyRef("en_US")));
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/OverrideModulePropertiesFeature.java b/jooby-tests/src/test/java/jooby/OverrideModulePropertiesFeature.java
@@ -58,7 +58,7 @@ public Object property() {
 
     use(new M1());
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/PathParamFeature.java b/jooby-tests/src/test/java/jooby/PathParamFeature.java
@@ -34,7 +34,7 @@ public String vars(final String name, final int age) {
       resp.send(name + " " + age);
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ReadBodyFeature.java b/jooby-tests/src/test/java/jooby/ReadBodyFeature.java
@@ -59,7 +59,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
     post("/json", (req, resp) -> resp.send(req.body(String.class)))
         .consumes(MediaType.json);
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/RegexParamFeature.java b/jooby-tests/src/test/java/jooby/RegexParamFeature.java
@@ -26,7 +26,7 @@ public Object regex(final int id) {
       resp.send(id);
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/RequestModuleFeature.java b/jooby-tests/src/test/java/jooby/RequestModuleFeature.java
@@ -69,7 +69,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
         resp.send(req.getInstance(RequestScoped.class));
       });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/RequestParamFeature.java b/jooby-tests/src/test/java/jooby/RequestParamFeature.java
@@ -125,7 +125,7 @@ public Object namedParam(@Named("not-java-name") final String p) {
 
   {
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ResponseBodyFeature.java b/jooby-tests/src/test/java/jooby/ResponseBodyFeature.java
@@ -43,7 +43,7 @@ public Response.Body headers() {
   }
 
   {
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ResponseStatusFeature.java b/jooby-tests/src/test/java/jooby/ResponseStatusFeature.java
@@ -37,7 +37,7 @@ public String json() {
         .consumes(MediaType.json)
         .produces(MediaType.json);
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/ScopeOfMvcRouteFeature.java b/jooby-tests/src/test/java/jooby/ScopeOfMvcRouteFeature.java
@@ -70,9 +70,9 @@ public Object m() {
 
   {
 
-    route(Single.class);
+    use(Single.class);
 
-    route(Proto.class);
+    use(Proto.class);
   }
 
   @Test
diff --git a/jooby-tests/src/test/java/jooby/StackFeature.java b/jooby-tests/src/test/java/jooby/StackFeature.java
@@ -95,7 +95,7 @@ public String subpathfjs() throws Exception {
       resp.send("subpath/f.js");
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test
@@ -113,10 +113,10 @@ public void rootStack() throws Exception {
 
   @Test
   public void subpathStack() throws Exception {
-//    assertEquals("subpath", execute(GET(uri("/subpath")), (response) -> {
-//      assertEquals("x", response.getFirstHeader("X").getValue());
-//      assertEquals("y", response.getFirstHeader("Y").getValue());
-//    }));
+    assertEquals("subpath", execute(GET(uri("/subpath")), (response) -> {
+      assertEquals("x", response.getFirstHeader("X").getValue());
+      assertEquals("y", response.getFirstHeader("Y").getValue());
+    }));
 
     assertEquals("subpath", execute(GET(uri("/r/subpath")), (response) -> {
       assertEquals("x", response.getFirstHeader("X").getValue());
diff --git a/jooby-tests/src/test/java/jooby/TemplateEngineFeature.java b/jooby-tests/src/test/java/jooby/TemplateEngineFeature.java
@@ -49,7 +49,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)
       resp.send(Viewable.of("test", "model"));
     });
 
-    route(Resource.class);
+    use(Resource.class);
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ public Route.Definition assets(final String path) {`
`619`	`619`	`*`
`620`	`620`	`* @param routeType The Mvc route.`
`621`	`621`	`*/`
`622`		`- public void route(final Class<?> routeType) {`
	`622`	`+ public void use(final Class<?> routeType) {`
`623`	`623`	`requireNonNull(routeType, "Route type is required.");`
`624`	`624`	`if (routeType.getAnnotation(javax.inject.Singleton.class) == null) {`
`625`	`625`	`protoRoutes.add(routeType);`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public String locale(final jooby.Request req) {`
`43`	`43`
`44`	`44`	`{`
`45`	`45`	`use(ConfigFactory.empty().withValue("application.charset", ConfigValueFactory.fromAnyRef(Charsets.ISO_8859_1.name())));`
`46`		`- route(Resource.class);`
	`46`	`+ use(Resource.class);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public Object letter() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`{`
`78`		`- route(Resource.class);`
	`78`	`+ use(Resource.class);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)`
`67`	`67`	`.produces(MediaType.json)`
`68`	`68`	`.consumes(MediaType.json);`
`69`	`69`
`70`		`- route(Resource.class);`
	`70`	`+ use(Resource.class);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`private static final String CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,/;q=0.8";`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public String formatter(final long time, final jooby.Request req) {`
`51`	`51`	`{`
`52`	`52`	`use(ConfigFactory.empty().withValue("application.lang",`
`53`	`53`	`ConfigValueFactory.fromAnyRef("en_US")));`
`54`		`- route(Resource.class);`
	`54`	`+ use(Resource.class);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void configure(final Mode mode, final Config config, final Binder binder)`
`39`	`39`
`40`	`40`	`get("/error", (req, resp) -> resp.send(null));`
`41`	`41`
`42`		`- route(Resource.class);`
	`42`	`+ use(Resource.class);`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`private static final String CHROME_ACCEPT = "text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,/;q=0.8";`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public String text(final String name, final int age) {`
`28`	`28`	`resp.send(name + " " + age);`
`29`	`29`	`});`
`30`	`30`
`31`		`- route(Resource.class);`
	`31`	`+ use(Resource.class);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public Object enumHeader(@Header final VOWELS h) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`{`
`66`		`- route(Resource.class);`
	`66`	`+ use(Resource.class);`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public String locale(final jooby.Request req) {`
`38`	`38`
`39`	`39`	`{`
`40`	`40`	`use(ConfigFactory.empty().withValue("application.lang", ConfigValueFactory.fromAnyRef("es_ar")));`
`41`		`- route(Resource.class);`
	`41`	`+ use(Resource.class);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public Object property() {`
`61`	`61`
`62`	`62`	`use(new M1());`
`63`	`63`
`64`		`- route(Resource.class);`
	`64`	`+ use(Resource.class);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Test`