fix issue: when user library used slf4j logging service, it will conflict with Act used sl4j logging service due to class loader issue; TemplatePathResolver now allow XLS and XLSX format; NetworkHandler: ContentSuffixSensor now support xls and xlsx suffix

greenlaw110 · greenlaw110 · commit ec02850b461e · 2016-10-25T12:01:08.000+11:00
diff --git a/src/main/java/act/app/ActionContext.java b/src/main/java/act/app/ActionContext.java
@@ -188,7 +188,7 @@ public boolean acceptJson() {
         return accept() == H.Format.JSON;
     }
 
-    public boolean isXML() {
+    public boolean acceptXML() {
         return accept() == H.Format.XML;
     }
 
diff --git a/src/main/java/act/boot/app/FullStackAppBootstrapClassLoader.java b/src/main/java/act/boot/app/FullStackAppBootstrapClassLoader.java
@@ -272,11 +272,11 @@ private void buildIndex() {
     @Override
     protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
         Class<?> c = findLoadedClass(name);
-        if (c != null) {
+        if (null != c) {
             return c;
         }
 
-        if (name.startsWith("java") || name.startsWith("org.osgl")) {
+        if (name.startsWith("java") || name.startsWith("org.osgl") || name.startsWith("org.slf4j")) {
             return super.loadClass(name, resolve);
         }
 
diff --git a/src/main/java/act/controller/Controller.java b/src/main/java/act/controller/Controller.java
@@ -679,7 +679,7 @@ public static Result inferResult(HandlerMethodMetaInfo meta, Object v, ActionCon
                             DisableFastJsonCircularReferenceDetect.option.set(false);
                         }
                     }
-                } else if (context.isXML()) {
+                } else if (context.acceptXML()) {
                     PropertySpec.MetaInfo propertySpec = (null == meta) ? null : meta.propertySpec();
                     return new FilteredRenderXML(v, propertySpec, context);
                 } else if (context.accept() == H.Format.CSV) {
diff --git a/src/main/java/act/view/TemplatePathResolver.java b/src/main/java/act/view/TemplatePathResolver.java
@@ -62,6 +62,6 @@ protected String amendSuffix(String path, ActContext context) {
     }
 
     public static boolean isAcceptFormatSupported(H.Format fmt) {
-        return (UNKNOWN == fmt || HTML == fmt || JSON == fmt || XML == fmt || TXT == fmt || CSV == fmt);
+        return (UNKNOWN == fmt || HTML == fmt || JSON == fmt || XML == fmt || TXT == fmt || CSV == fmt || XLS == fmt || XLSX == fmt);
     }
 }
diff --git a/src/main/java/act/xio/NetworkHandler.java b/src/main/java/act/xio/NetworkHandler.java
@@ -145,6 +145,9 @@ private static class ContentSuffixSensor implements $.Func2<H.Request, String, S
         private static final char[] json = {'j', 's', 'o'};
         private static final char[] xml = {'x', 'm'};
         private static final char[] csv = {'c', 's'};
+        private static final char[] xls = {'x', 'l', 's'};
+        private static final char[] xlsx = {'x', 'l', 's', 'x'};
+        private static final char[] pdf = {'p', 'd', 'f'};
 
         @Override
         public String apply(H.Request req, String url) throws NotAppliedException, Osgl.Break {
@@ -167,6 +170,19 @@ public String apply(H.Request req, String url) throws NotAppliedException, Osgl.
                     trait = csv;
                     fmt = H.Format.CSV;
                     break;
+                case 'f':
+                    trait = pdf;
+                    fmt = H.Format.PDF;
+                    break;
+                case 's':
+                    trait = xls;
+                    fmt = H.Format.XLS;
+                    break;
+                case 'x':
+                    sepPos = 4;
+                    trait = xlsx;
+                    fmt = H.Format.XLSX;
+                    break;
                 default:
                     return url;
             }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public boolean acceptJson() {`
`188`	`188`	`return accept() == H.Format.JSON;`
`189`	`189`	`}`
`190`	`190`
`191`		`- public boolean isXML() {`
	`191`	`+ public boolean acceptXML() {`
`192`	`192`	`return accept() == H.Format.XML;`
`193`	`193`	`}`
`194`	`194`
Original file line number	Diff line number	Diff line change
`@@ -272,11 +272,11 @@ private void buildIndex() {`
`272`	`272`	`@Override`
`273`	`273`	`protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {`
`274`	`274`	`Class<?> c = findLoadedClass(name);`
`275`		`- if (c != null) {`
	`275`	`+ if (null != c) {`
`276`	`276`	`return c;`
`277`	`277`	`}`
`278`	`278`
`279`		`- if (name.startsWith("java") \|\| name.startsWith("org.osgl")) {`
	`279`	`+ if (name.startsWith("java") \|\| name.startsWith("org.osgl") \|\| name.startsWith("org.slf4j")) {`
`280`	`280`	`return super.loadClass(name, resolve);`
`281`	`281`	`}`
`282`	`282`
Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ public static Result inferResult(HandlerMethodMetaInfo meta, Object v, ActionCon`
`679`	`679`	`DisableFastJsonCircularReferenceDetect.option.set(false);`
`680`	`680`	`}`
`681`	`681`	`}`
`682`		`- } else if (context.isXML()) {`
	`682`	`+ } else if (context.acceptXML()) {`
`683`	`683`	`PropertySpec.MetaInfo propertySpec = (null == meta) ? null : meta.propertySpec();`
`684`	`684`	`return new FilteredRenderXML(v, propertySpec, context);`
`685`	`685`	`} else if (context.accept() == H.Format.CSV) {`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ protected String amendSuffix(String path, ActContext context) {`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`public static boolean isAcceptFormatSupported(H.Format fmt) {`
`65`		`- return (UNKNOWN == fmt \|\| HTML == fmt \|\| JSON == fmt \|\| XML == fmt \|\| TXT == fmt \|\| CSV == fmt);`
	`65`	`+ return (UNKNOWN == fmt \|\| HTML == fmt \|\| JSON == fmt \|\| XML == fmt \|\| TXT == fmt \|\| CSV == fmt \|\| XLS == fmt \|\| XLSX == fmt);`
`66`	`66`	`}`
`67`	`67`	`}`