cosmetic update - remove some warnings ...

greenlaw110 · greenlaw110 · commit cb256e9dd1e7 · 2016-01-07T23:25:31.000+11:00
diff --git a/src/main/java/act/app/util/AppCrypto.java b/src/main/java/act/app/util/AppCrypto.java
@@ -38,7 +38,7 @@ public String encrypt(String message) {
                 logger.error("Cannot encrypt/decrypt! Please download Java Crypto Extension pack from Oracle: http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html");
                 if (Act.isDev()) {
                     logger.warn("Application will keep running with no encrypt/decrypt facilities in Dev mode");
-                    return Codec.encodeBASE64(message);
+                    return Codec.encodeBase64(message);
                 }
             }
             throw e;
@@ -54,7 +54,7 @@ public String decrypt(String message) {
                 logger.error("Cannot encrypt/decrypt! Please download Java Crypto Extension pack from Oracle: http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html");
                 if (Act.isDev()) {
                     logger.warn("Application will keep running with no encrypt/decrypt facilities in Dev mode");
-                    return new String(Codec.decodeBASE64(message));
+                    return new String(Codec.decodeBase64(message));
                 }
             }
             throw e;
diff --git a/src/main/java/act/data/ApacheMultipartParser.java b/src/main/java/act/data/ApacheMultipartParser.java
@@ -1005,7 +1005,7 @@ void close() throws IOException {
          */
         FileItemIteratorImpl(InputStream input, H.Format contentType, String charEncoding) throws FileUploadException, IOException {
 
-            if ((null == contentType) || (!contentType.toContentType().toLowerCase().startsWith(MULTIPART))) {
+            if ((null == contentType) || (!contentType.contentType().toLowerCase().startsWith(MULTIPART))) {
                 throw new InvalidContentTypeException("the request doesn't contain a " + MULTIPART_FORM_DATA + " or " + MULTIPART_MIXED + " stream, content type header is " + contentType);
             }
 
@@ -1022,7 +1022,7 @@ protected void raiseError(long pSizeMax, long pCount) throws IOException {
 
             }
 
-            boundary = getBoundary(contentType.toContentType());
+            boundary = getBoundary(contentType.contentType());
             if (boundary == null) {
                 throw new FileUploadException("the request was rejected because " + "no multipart boundary was found");
             }
diff --git a/src/main/java/act/handler/builtin/Echo.java b/src/main/java/act/handler/builtin/Echo.java
@@ -11,7 +11,7 @@ public class Echo extends FastRequestHandler {
     private String contentType;
 
     public Echo(String msg) {
-        this(msg, H.Format.txt.toContentType());
+        this(msg, H.Format.TXT.contentType());
     }
 
     public Echo(String msg, String contentType) {
diff --git a/src/main/java/act/handler/builtin/StaticFileGetter.java b/src/main/java/act/handler/builtin/StaticFileGetter.java
@@ -61,8 +61,8 @@ public void handle(ActionContext context) {
         }
         InputStream is = new BufferedInputStream(IO.is(file));
         H.Response resp = context.resp();
-        if (H.Format.unknown != fmt) {
-            resp.contentType(fmt.toContentType());
+        if (H.Format.UNKNOWN != fmt) {
+            resp.contentType(fmt.contentType());
         }
         IO.copy(is, context.resp().outputStream());
     }
diff --git a/src/main/java/act/util/DataObjectEnhancer.java b/src/main/java/act/util/DataObjectEnhancer.java
@@ -13,21 +13,21 @@
  * methods, e.g. {@link Object#equals(Object)}
  */
 @ActComponent
-public class DataEnhancer extends AppByteCodeEnhancer<DataEnhancer> {
+public class DataObjectEnhancer extends AppByteCodeEnhancer<DataObjectEnhancer> {
 
     private ObjectMetaInfo metaInfo;
 
-    public DataEnhancer() {
+    public DataObjectEnhancer() {
         super($.F.<String>yes());
     }
 
-    protected DataEnhancer(ClassVisitor cv) {
+    protected DataObjectEnhancer(ClassVisitor cv) {
         super($.F.<String>yes(), cv);
     }
 
     @Override
-    protected Class<DataEnhancer> subClass() {
-        return DataEnhancer.class;
+    protected Class<DataObjectEnhancer> subClass() {
+        return DataObjectEnhancer.class;
     }
 
     @Override
diff --git a/src/main/java/act/util/ObjectMetaInfo.java b/src/main/java/act/util/ObjectMetaInfo.java
@@ -10,7 +10,7 @@
 import org.osgl.util.S;
 
 /**
- * Datastructure captures a class's meta information in related to {@link DataEnhancer}.
+ * Datastructure captures a class's meta information in related to {@link DataObjectEnhancer}.
  * The following info will be captured:
  * <ul>
  *     <li>Is the class annotated with {@link Data} annotation</li>
diff --git a/src/test/java/act/handler/builtin/StaticFileGetterTest.java b/src/test/java/act/handler/builtin/StaticFileGetterTest.java
@@ -45,7 +45,7 @@ public File answer(InvocationOnMock invocation) throws Throwable {
 
     @Test
     public void invokePathHandlerOnNonExistingResource() {
-        when(ctx.accept()).thenReturn(H.Format.html);
+        when(ctx.accept()).thenReturn(H.Format.HTML);
         ctx.param(ParamNames.PATH, "/some/where/non_exists.txt");
         pathHandler.handle(ctx);
         eq(resp.status, 404);
diff --git a/src/test/java/act/util/DataObjectEnhancerTest.java b/src/test/java/act/util/DataObjectEnhancerTest.java
@@ -18,7 +18,7 @@
 import java.io.PrintWriter;
 import java.lang.reflect.Method;
 
-public class DataEnhancerTest extends TestBase {
+public class DataObjectEnhancerTest extends TestBase {
 
     public static final String TMPL_PATH = "/path/to/template";
 
@@ -141,7 +141,7 @@ protected synchronized Class<?> loadClass(final String name,
             try {
                 ClassReader cr = new ClassReader(is);
                 ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-                DataEnhancer enhancer = new DataEnhancer(cw);
+                DataObjectEnhancer enhancer = new DataObjectEnhancer(cw);
                 cr.accept(enhancer, 0);
                 b = cw.toByteArray();
                 //CheckClassAdapter.verify(new ClassReader(cw.toByteArray()), true, new PrintWriter(System.out));
diff --git a/src/test/java/testapp/cli/StaticWithoutReturnType.java b/src/test/java/testapp/cli/StaticWithoutReturnType.java
@@ -1,16 +1,14 @@
 package testapp.cli;
 
 import act.cli.Command;
-import act.cli.HelpMsg;
 import act.cli.Optional;
 import act.cli.Required;
 
 public class StaticWithoutReturnType {
 
     private String s;
 
-    @Command("foo.bar")
-    @HelpMsg("help")
+    @Command(value = "foo.bar", help = "help")
     public static void doIt(
             @Required(lead = "-o,--op1") String op1,
             @Optional(lead = "-n,--number") int num
diff --git a/src/test/java/testapp/controller/HelloWorldApp.java b/src/test/java/testapp/controller/HelloWorldApp.java
@@ -27,7 +27,7 @@ public HelloWorldApp() {
     @Before
     public void mockFormat(String fmt) {
         if ("json".equals(fmt)) {
-            context.accept(H.Format.json);
+            context.accept(H.Format.JSON);
         }
         context.session().put("foo", "bar");
     }
diff --git a/src/test/java/testapp/controller/VoidResultWithParamCtxFieldEmptyBody.java b/src/test/java/testapp/controller/VoidResultWithParamCtxFieldEmptyBody.java
@@ -15,7 +15,7 @@ public class VoidResultWithParamCtxFieldEmptyBody  {
     @Before
     public void mockFormat(String fmt, ActionContext context) {
         if ("json".equals(fmt)) {
-            context.accept(H.Format.json);
+            context.accept(H.Format.JSON);
         }
         context.session().put("foo", "bar");
     }

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public String encrypt(String message) {`
`38`	`38`	`logger.error("Cannot encrypt/decrypt! Please download Java Crypto Extension pack from Oracle: http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html");`
`39`	`39`	`if (Act.isDev()) {`
`40`	`40`	`logger.warn("Application will keep running with no encrypt/decrypt facilities in Dev mode");`
`41`		`- return Codec.encodeBASE64(message);`
	`41`	`+ return Codec.encodeBase64(message);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`throw e;`
`@@ -54,7 +54,7 @@ public String decrypt(String message) {`
`54`	`54`	`logger.error("Cannot encrypt/decrypt! Please download Java Crypto Extension pack from Oracle: http://www.oracle.com/technetwork/java/javase/tech/index-jsp-136007.html");`
`55`	`55`	`if (Act.isDev()) {`
`56`	`56`	`logger.warn("Application will keep running with no encrypt/decrypt facilities in Dev mode");`
`57`		`- return new String(Codec.decodeBASE64(message));`
	`57`	`+ return new String(Codec.decodeBase64(message));`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`throw e;`
Original file line number	Diff line number	Diff line change
`@@ -1005,7 +1005,7 @@ void close() throws IOException {`
`1005`	`1005`	`*/`
`1006`	`1006`	`FileItemIteratorImpl(InputStream input, H.Format contentType, String charEncoding) throws FileUploadException, IOException {`
`1007`	`1007`
`1008`		`- if ((null == contentType) \|\| (!contentType.toContentType().toLowerCase().startsWith(MULTIPART))) {`
	`1008`	`+ if ((null == contentType) \|\| (!contentType.contentType().toLowerCase().startsWith(MULTIPART))) {`
`1009`	`1009`	`throw new InvalidContentTypeException("the request doesn't contain a " + MULTIPART_FORM_DATA + " or " + MULTIPART_MIXED + " stream, content type header is " + contentType);`
`1010`	`1010`	`}`
`1011`	`1011`
`@@ -1022,7 +1022,7 @@ protected void raiseError(long pSizeMax, long pCount) throws IOException {`
`1022`	`1022`
`1023`	`1023`	`}`
`1024`	`1024`
`1025`		`- boundary = getBoundary(contentType.toContentType());`
	`1025`	`+ boundary = getBoundary(contentType.contentType());`
`1026`	`1026`	`if (boundary == null) {`
`1027`	`1027`	`throw new FileUploadException("the request was rejected because " + "no multipart boundary was found");`
`1028`	`1028`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public class Echo extends FastRequestHandler {`
`11`	`11`	`private String contentType;`
`12`	`12`
`13`	`13`	`public Echo(String msg) {`
`14`		`- this(msg, H.Format.txt.toContentType());`
	`14`	`+ this(msg, H.Format.TXT.contentType());`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public Echo(String msg, String contentType) {`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public void handle(ActionContext context) {`
`61`	`61`	`}`
`62`	`62`	`InputStream is = new BufferedInputStream(IO.is(file));`
`63`	`63`	`H.Response resp = context.resp();`
`64`		`- if (H.Format.unknown != fmt) {`
`65`		`- resp.contentType(fmt.toContentType());`
	`64`	`+ if (H.Format.UNKNOWN != fmt) {`
	`65`	`+ resp.contentType(fmt.contentType());`
`66`	`66`	`}`
`67`	`67`	`IO.copy(is, context.resp().outputStream());`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public HelloWorldApp() {`
`27`	`27`	`@Before`
`28`	`28`	`public void mockFormat(String fmt) {`
`29`	`29`	`if ("json".equals(fmt)) {`
`30`		`- context.accept(H.Format.json);`
	`30`	`+ context.accept(H.Format.JSON);`
`31`	`31`	`}`
`32`	`32`	`context.session().put("foo", "bar");`
`33`	`33`	`}`