Merge remote-tracking branch 'origin/wsdl-validator-new-wsdl-parser' into wsdl-validator-new-wsdl-parser

Author: predic8

core/src/main/java/com/predic8/membrane/core/interceptor/server/WebServerInterceptor.java

@@ -128,7 +128,7 @@ public Outcome handleRequest(Exchange exc) {
 
         try {
             exc.setTimeReqSent(currentTimeMillis());
-            exc.setResponse(createResponse(router.getResolverMap(), combine(router.getConfiguration().getBaseLocation(), docBase, uri)));
+            exc.setResponse(createResponseInternal(router.getResolverMap(), combine(router.getConfiguration().getBaseLocation(), docBase, uri)));
             exc.setReceived();
             exc.setTimeResReceived(currentTimeMillis());
             return RETURN;
@@ -191,18 +191,15 @@ public Outcome handleRequest(Exchange exc) {
 
     private boolean tryToReceiveResource(Exchange exc, String uri) {
         for (String i : index) {
-            Response response = createResponse(
-                    router.getResolverMap(),
-                    combine(router.getConfiguration().getBaseLocation(), docBase, uri + i)
-            );
-
-            if (!response.isOk())
-                continue;
-
-            exc.setResponse(response);
-            exc.setReceived();
-            exc.setTimeResReceived(currentTimeMillis());
-            return true;
+            try {
+                Response response = createResponseInternal(router.getResolverMap(), ResolverMap.combine(router.getConfiguration().getBaseLocation(), docBase, uri + i));
+                if (!response.isOk())
+                    continue;
+                exc.setResponse(response);
+                exc.setReceived();
+                exc.setTimeResReceived(currentTimeMillis());
+                return true;
+            } catch (ResourceRetrievalException ignored) {}
         }
         return false;
     }
@@ -248,10 +245,7 @@ private boolean escapesPath(String uri) {
 
     public Response createResponse(ResolverMap rr, String resPath) {
         try {
-            return ok()
-                    .header(createHeaders(getContentType(resPath)))
-                    .body(rr.resolve(resPath), true)
-                    .build();
+            return createResponseInternal(rr, resPath);
         } catch (Exception e) {
             return internal(router.getConfiguration().isProduction(), getDisplayName())
                     .title("Could not resolve file")
@@ -261,6 +255,13 @@ public Response createResponse(ResolverMap rr, String resPath) {
         }
     }
 
+    private Response createResponseInternal(ResolverMap rr, String resPath) throws ResourceRetrievalException {
+        return ok()
+                .header(createHeaders(getContentType(resPath)))
+                .body(rr.resolve(resPath), true)
+                .build();
+    }
+
     public String getDocBase() {
         return docBase;
     }

core/src/test/java/com/predic8/membrane/core/interceptor/server/WebServerInterceptorTest.java

@@ -51,15 +51,20 @@ void noIndex() {
         ws.setGenerateIndex(false);
         ws.handleRequest(exc);
         // No index file is set, and no index page is generated, so throw not found.
-//        System.out.println("exc.getResponse().getBodyAsStringDecoded() = " + exc.getResponse().getBodyAsStringDecoded());
-        assertEquals(500, exc.getResponse().getStatusCode());
+        // System.out.println("exc.getResponse().getBodyAsStringDecoded() = " + exc.getResponse().getBodyAsStringDecoded());
+        assertEquals(404, exc.getResponse().getStatusCode());
     }
 
     @Test
     void generateIndex() {
         ws.setGenerateIndex(true);
         ws.handleRequest(exc);
         // No index file is set, but index page is being generated. Body lists the page.html resource.
-        assertTrue(exc.getResponse().getBodyAsStringDecoded().contains("page.html"));
+        assertEquals(200, exc.getResponse().getStatusCode());
+        assertTrue(exc.getResponse().getHeader().getFirstValue("Content-Type").contains("text/html"));
+
+        String body = exc.getResponse().getBodyAsStringDecoded();
+        assertTrue(body.contains("<a href=\"./index.html\">index.html</a>"));
+        assertTrue(body.contains("<a href=\"./page.html\">page.html</a>"));
     }
 }