Repository: incubator-juneau Updated Branches: refs/heads/master 70d23459b -> 23fe563dd
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java ---------------------------------------------------------------------- diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java index e5df6a5..4b18c52 100755 --- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java +++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/RestMicroservice.java @@ -287,7 +287,7 @@ public class RestMicroservice extends Microservice { ObjectMap loggerLevels = cf.getObject("Logging/levels", ObjectMap.class); if (loggerLevels != null) for (String l : loggerLevels.keySet()) - Logger.getLogger(l).setLevel(loggerLevels.get(Level.class, l)); + Logger.getLogger(l).setLevel(loggerLevels.get(l, Level.class)); } /** @@ -347,7 +347,7 @@ public class RestMicroservice extends Microservice { server = (Server)config.configure(); } else { - int[] ports = cf.getObjectWithDefault("REST/port", mf.get(int[].class, "Rest-Port", new int[]{8000}), int[].class); + int[] ports = cf.getObjectWithDefault("REST/port", mf.getWithDefault("Rest-Port", new int[]{8000}, int[].class), int[].class); port = findOpenPort(ports); if (port == 0) { http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-releng/eclipse-preferences/user-dictionary.txt ---------------------------------------------------------------------- diff --git a/juneau-releng/eclipse-preferences/user-dictionary.txt b/juneau-releng/eclipse-preferences/user-dictionary.txt index 9a5cc4a..6401d9c 100644 --- a/juneau-releng/eclipse-preferences/user-dictionary.txt +++ b/juneau-releng/eclipse-preferences/user-dictionary.txt @@ -482,3 +482,4 @@ popup hyperlinked bpx bpi +tooltip http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/.classpath ---------------------------------------------------------------------- diff --git a/juneau-rest-test/.classpath b/juneau-rest-test/.classpath index 1f88af1..7512d53 100644 --- a/juneau-rest-test/.classpath +++ b/juneau-rest-test/.classpath @@ -22,7 +22,7 @@ <classpathentry kind="src" path="/juneau-rest"/> <classpathentry kind="src" path="/juneau-core"/> <classpathentry kind="src" path="/juneau-rest-client"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> <attributes> <attribute name="maven.pomderived" value="true"/> </attributes> http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java index 4919b75..27add70 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/AcceptCharsetResource.java @@ -68,7 +68,7 @@ public class AcceptCharsetResource extends RestServlet { @Override /* ParserSession */ @SuppressWarnings("unchecked") protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws Exception { - return (T)getProperty("characterEncoding"); + return (T)getStringProperty("characterEncoding"); } }; } @@ -88,7 +88,7 @@ public class AcceptCharsetResource extends RestServlet { @Override /* SerializerSession */ protected void doSerialize(SerializerPipe out, Object o) throws Exception { Writer w = new OutputStreamWriter(out.getOutputStream()); - w.append(o.toString()).append('/').append(getProperty("characterEncoding")); + w.append(o.toString()).append('/').append(getStringProperty("characterEncoding")); w.flush(); } }; http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java index 183889d..7c5f1b4 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/NlsPropertyResource.java @@ -65,7 +65,7 @@ public class NlsPropertyResource extends RestServlet { @Override /* SerializerSession */ protected void doSerialize(SerializerPipe out, Object o) throws Exception { - out.getWriter().write(getProperty("TestProperty")); + out.getWriter().write(getStringProperty("TestProperty")); } }; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java index 10172eb..fb38931 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPostCallResource.java @@ -54,7 +54,7 @@ public class OnPostCallResource extends RestServlet { @Override /* SerializerSession */ protected void doSerialize(SerializerPipe out, Object o) throws Exception { - out.getWriter().write("p1="+getProperty("p1")+",p2="+getProperty("p2")+",p3="+getProperty("p3")+",p4="+getProperty("p4")+",p5="+getProperty("p5")+",contentType="+getProperty("mediaType")); + out.getWriter().write("p1="+getStringProperty("p1")+",p2="+getStringProperty("p2")+",p3="+getStringProperty("p3")+",p4="+getStringProperty("p4")+",p5="+getStringProperty("p5")+",contentType="+getStringProperty("mediaType")); } @Override /* SerializerSession */ http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java index 21a784e..9390051 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/OnPreCallResource.java @@ -53,8 +53,8 @@ public class OnPreCallResource extends RestServlet { @Override /* ParserSession */ @SuppressWarnings("unchecked") protected <T> T doParse(ParserPipe pipe, ClassMeta<T> type) throws Exception { - String matchingContentType = getProperty("mediaType"); - return (T)("p1="+getProperty("p1")+",p2="+getProperty("p2")+",p3="+getProperty("p3")+",p4="+getProperty("p4")+",p5="+getProperty("p5")+",contentType="+matchingContentType); + String matchingContentType = getStringProperty("mediaType"); + return (T)("p1="+getStringProperty("p1")+",p2="+getStringProperty("p2")+",p3="+getStringProperty("p3")+",p4="+getStringProperty("p4")+",p5="+getStringProperty("p5")+",contentType="+matchingContentType); } }; } http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/23fe563d/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java ---------------------------------------------------------------------- diff --git a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java index 604d485..2b47160 100644 --- a/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java +++ b/juneau-rest-test/src/main/java/org/apache/juneau/rest/test/PropertiesResource.java @@ -73,8 +73,8 @@ public class PropertiesResource extends RestServletDefault { @Override /* SerializerSession */ protected void doSerialize(SerializerPipe out, Object o) throws Exception { out.getWriter().write(format("A1=%s,A2=%s,B1=%s,B2=%s,C=%s,R1a=%s,R1b=%s,R2=%s,R3=%s,R4=%s,R5=%s,R6=%s", - getProperty("A1"), getProperty("A2"), getProperty("B1"), getProperty("B2"), getProperty("C"), - getProperty("R1a"), getProperty("R1b"), getProperty("R2"), getProperty("R3"), getProperty("R4"), getProperty("R5"), getProperty("R6"))); + getStringProperty("A1"), getStringProperty("A2"), getStringProperty("B1"), getStringProperty("B2"), getStringProperty("C"), + getStringProperty("R1a"), getStringProperty("R1b"), getStringProperty("R2"), getStringProperty("R3"), getStringProperty("R4"), getStringProperty("R5"), getStringProperty("R6"))); } }; } @@ -101,7 +101,7 @@ public class PropertiesResource extends RestServletDefault { @Override /* SerializerSession */ protected void doSerialize(SerializerPipe out, Object o) throws Exception { - out.getWriter().write(format("A=%s,P=%s,H=%s", getProperty("A"), getProperty("P"), getProperty("h"))); + out.getWriter().write(format("A=%s,P=%s,H=%s", getStringProperty("A"), getStringProperty("P"), getStringProperty("h"))); } }; }
