fix extension to Viewable.

Daniel-Dos · chkal · commit 3bb393c7d2d4 · 2018-10-07T07:19:02.000+02:00
refactor the code.
diff --git a/core/src/main/java/org/mvcspec/ozark/core/ViewResponseFilter.java b/core/src/main/java/org/mvcspec/ozark/core/ViewResponseFilter.java
@@ -32,6 +32,7 @@
 import javax.ws.rs.Priorities;
 import javax.ws.rs.Produces;
 import javax.ws.rs.ServerErrorException;
+import javax.ws.rs.client.ResponseProcessingException;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
@@ -141,8 +142,8 @@ public void filter(ContainerRequestContext requestContext,
             } else if (returnType == Void.TYPE) {
                 throw new ServerErrorException(messages.get("VoidControllerNoView", resourceInfo.getResourceMethod()), INTERNAL_SERVER_ERROR);
             }
-        } else if (entityType != Viewable.class) {
-            final String view = appendExtensionIfRequired(entity.toString());
+        } else {
+            final String view = appendExtensionIfRequired(entityType == Viewable.class ? ((Viewable) entity).getView() : entity.toString());
             if (view == null) {
                 throw new ServerErrorException(messages.get("EntityToStringNull", resourceInfo.getResourceMethod()), INTERNAL_SERVER_ERROR);
             }
diff --git a/examples/def-ext/src/main/java/org/mvcspec/ozark/test/mvc/DefaultExtensionController.java b/examples/def-ext/src/main/java/org/mvcspec/ozark/test/mvc/DefaultExtensionController.java
@@ -16,8 +16,12 @@
 package org.mvcspec.ozark.test.mvc;
 
 import javax.mvc.Controller;
+import javax.mvc.View;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+
+import org.mvcspec.ozark.engine.Viewable;
 
 /**
  * DefaultExtensionController test.
@@ -29,7 +33,25 @@
 public class DefaultExtensionController {
 
     @GET
-    public String get() {
+    @Path("string")
+    public String getString() {
         return "extension";
     }
+    
+    @GET
+    @Path("void")
+    @View("extension")
+    public void getView() { }
+    
+    @GET
+    @Path("viewable")
+    public Viewable getViewAble() {
+        return new Viewable("extension");
+    }
+    
+    @GET
+    @Path("response")
+    public Response getResponse() {
+        return Response.ok().entity("extension").build();
+    }
 }
diff --git a/examples/def-ext/src/main/webapp/index.html b/examples/def-ext/src/main/webapp/index.html
@@ -8,7 +8,10 @@
 <body>
 <h1>Default extension</h1>
 <ul>
-    <li><a href="resources/def-ext">resources/def-ext</a>
+    <li><a href="resources/def-ext/string">resources/def-ext/String</a>
+    <li><a href="resources/def-ext/void">resources/def-ext/void</a>
+    <li><a href="resources/def-ext/viewable">resources/def-ext/viewable</a>
+    <li><a href="resources/def-ext/response">resources/def-ext/response</a>
 </ul>
 <br/>
 <!--<a class="source" href="https://github.com/mvc-spec/ozark/blob/master/test/*.java">Source Code</a>-->
diff --git a/examples/def-ext/src/test/java/org/mvcspec/ozark/test/mvc/DefaultExtensionIT.java b/examples/def-ext/src/test/java/org/mvcspec/ozark/test/mvc/DefaultExtensionIT.java
@@ -45,8 +45,29 @@ public void tearDown() {
     }
 
     @Test
-    public void test() throws Exception {
-        HtmlPage page = webClient.getPage(webUrl + "resources/def-ext");
+    public void testString() throws Exception {
+        HtmlPage page = webClient.getPage(webUrl + "resources/def-ext/string");
+        assertEquals("/test-def-ext/resources", page.getElementById("basePath").asText());
+        assertEquals("jsp", page.getElementById("defaultExtension").asText());
+    }
+    
+    @Test
+    public void testViewable() throws Exception {
+        HtmlPage page = webClient.getPage(webUrl + "resources/def-ext/viewable");
+        assertEquals("/test-def-ext/resources", page.getElementById("basePath").asText());
+        assertEquals("jsp", page.getElementById("defaultExtension").asText());
+    }
+    
+    @Test
+    public void testResponse() throws Exception {
+        HtmlPage page = webClient.getPage(webUrl + "resources/def-ext/response");
+        assertEquals("/test-def-ext/resources", page.getElementById("basePath").asText());
+        assertEquals("jsp", page.getElementById("defaultExtension").asText());
+    }
+    
+    @Test
+    public void testVoid() throws Exception {
+        HtmlPage page = webClient.getPage(webUrl + "resources/def-ext/void");
         assertEquals("/test-def-ext/resources", page.getElementById("basePath").asText());
         assertEquals("jsp", page.getElementById("defaultExtension").asText());
     }
