Rename consume -> consumes in WebSocket and Route

jknack · jknack · commit 7c3316f84683 · 2014-10-14T15:49:30.000-03:00
diff --git a/jooby-core/src/main/java/jooby/Route.java b/jooby-core/src/main/java/jooby/Route.java
@@ -326,8 +326,8 @@ public Map<String, String> vars() {
     }
 
     @Override
-    public List<MediaType> consume() {
-      return route.consume();
+    public List<MediaType> consumes() {
+      return route.consumes();
     }
 
     @Override
@@ -478,7 +478,7 @@ private static String message(final Response.Status status, final String tail) {
 
   Map<String, String> vars();
 
-  List<MediaType> consume();
+  List<MediaType> consumes();
 
   List<MediaType> produces();
 
diff --git a/jooby-core/src/main/java/jooby/WebSocket.java b/jooby-core/src/main/java/jooby/WebSocket.java
@@ -4,8 +4,6 @@
 
 import java.io.Closeable;
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
@@ -146,22 +144,6 @@ public Definition name(final String name) {
       return this;
     }
 
-    /**
-     * @param candidate A media type to test.
-     * @return True, if the route can consume the given media type.
-     */
-    public boolean canConsume(@Nonnull final MediaType candidate) {
-      return MediaType.matcher(Arrays.asList(candidate)).matches(consumes);
-    }
-
-    /**
-     * @param candidates A media types to test.
-     * @return True, if the route can produces the given media type.
-     */
-    public boolean canProduce(final List<MediaType> candidates) {
-      return MediaType.matcher(candidates).matches(produces);
-    }
-
     /**
      * Set the media types the route can consume.
      *
@@ -300,7 +282,7 @@ private WebSocket asWebSocket(final RouteMatcher matcher) {
 
   Map<String, String> vars();
 
-  MediaType consume();
+  MediaType consumes();
 
   MediaType produces();
 
diff --git a/jooby-core/src/main/java/jooby/internal/RouteImpl.java b/jooby-core/src/main/java/jooby/internal/RouteImpl.java
@@ -88,7 +88,7 @@ public Map<String, String> vars() {
   }
 
   @Override
-  public List<MediaType> consume() {
+  public List<MediaType> consumes() {
     return consumes;
   }
 
@@ -104,7 +104,7 @@ public String toString() {
     buffer.append("  pattern: ").append(pattern()).append("\n");
     buffer.append("  name: ").append(name()).append("\n");
     buffer.append("  vars: ").append(vars()).append("\n");
-    buffer.append("  consume: ").append(consume()).append("\n");
+    buffer.append("  consumes: ").append(consumes()).append("\n");
     buffer.append("  produces: ").append(produces()).append("\n");
     return buffer.toString();
   }
diff --git a/jooby-core/src/main/java/jooby/internal/WebSocketImpl.java b/jooby-core/src/main/java/jooby/internal/WebSocketImpl.java
@@ -200,7 +200,7 @@ public Map<String, String> vars() {
   }
 
   @Override
-  public MediaType consume() {
+  public MediaType consumes() {
     return consumes;
   }
 
@@ -221,7 +221,7 @@ public String toString() {
     buffer.append("  pattern: ").append(pattern()).append("\n");
     buffer.append("  name: ").append(name()).append("\n");
     buffer.append("  vars: ").append(vars()).append("\n");
-    buffer.append("  consume: ").append(consume()).append("\n");
+    buffer.append("  consumes: ").append(consumes()).append("\n");
     buffer.append("  produces: ").append(produces()).append("\n");
     return buffer.toString();
   }
diff --git a/jooby-core/src/main/java/jooby/internal/jetty/JettyWebSocketHandler.java b/jooby-core/src/main/java/jooby/internal/jetty/JettyWebSocketHandler.java
@@ -45,7 +45,7 @@ public void onWebSocketText(final String value) {
     try {
       // for Web Socket, charset is always UTF-8
       Variant variant = new VariantImpl(injector, "message", ImmutableList.of(value),
-          socket.consume(), Charsets.UTF_8);
+          socket.consumes(), Charsets.UTF_8);
       socket.fireMessage(variant);
     } catch (Exception ex) {
       onWebSocketError(ex);

Original file line number	Diff line number	Diff line change
`@@ -326,8 +326,8 @@ public Map<String, String> vars() {`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`@Override`
`329`		`- public List<MediaType> consume() {`
`330`		`- return route.consume();`
	`329`	`+ public List<MediaType> consumes() {`
	`330`	`+ return route.consumes();`
`331`	`331`	`}`
`332`	`332`
`333`	`333`	`@Override`
`@@ -478,7 +478,7 @@ private static String message(final Response.Status status, final String tail) {`
`478`	`478`
`479`	`479`	`Map<String, String> vars();`
`480`	`480`
`481`		`- List<MediaType> consume();`
	`481`	`+ List<MediaType> consumes();`
`482`	`482`
`483`	`483`	`List<MediaType> produces();`
`484`	`484`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public Map<String, String> vars() {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`@Override`
`91`		`- public List<MediaType> consume() {`
	`91`	`+ public List<MediaType> consumes() {`
`92`	`92`	`return consumes;`
`93`	`93`	`}`
`94`	`94`
`@@ -104,7 +104,7 @@ public String toString() {`
`104`	`104`	`buffer.append(" pattern: ").append(pattern()).append("\n");`
`105`	`105`	`buffer.append(" name: ").append(name()).append("\n");`
`106`	`106`	`buffer.append(" vars: ").append(vars()).append("\n");`
`107`		`- buffer.append(" consume: ").append(consume()).append("\n");`
	`107`	`+ buffer.append(" consumes: ").append(consumes()).append("\n");`
`108`	`108`	`buffer.append(" produces: ").append(produces()).append("\n");`
`109`	`109`	`return buffer.toString();`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public Map<String, String> vars() {`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`@Override`
`203`		`- public MediaType consume() {`
	`203`	`+ public MediaType consumes() {`
`204`	`204`	`return consumes;`
`205`	`205`	`}`
`206`	`206`
`@@ -221,7 +221,7 @@ public String toString() {`
`221`	`221`	`buffer.append(" pattern: ").append(pattern()).append("\n");`
`222`	`222`	`buffer.append(" name: ").append(name()).append("\n");`
`223`	`223`	`buffer.append(" vars: ").append(vars()).append("\n");`
`224`		`- buffer.append(" consume: ").append(consume()).append("\n");`
	`224`	`+ buffer.append(" consumes: ").append(consumes()).append("\n");`
`225`	`225`	`buffer.append(" produces: ").append(produces()).append("\n");`
`226`	`226`	`return buffer.toString();`
`227`	`227`	`}`