You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by ja...@apache.org on 2017/03/10 17:21:34 UTC
incubator-juneau git commit: Code cleanup.
Repository: incubator-juneau
Updated Branches:
refs/heads/master 95e832e1a -> 6e3f3e150
Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6e3f3e15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6e3f3e15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6e3f3e15
Branch: refs/heads/master
Commit: 6e3f3e15002c0573cecd62e231931720a4eff1e6
Parents: 95e832e
Author: JamesBognar <ja...@apache.org>
Authored: Fri Mar 10 09:21:34 2017 -0800
Committer: JamesBognar <ja...@apache.org>
Committed: Fri Mar 10 09:21:34 2017 -0800
----------------------------------------------------------------------
.../main/java/org/apache/juneau/jena/RdfParser.java | 13 +++++--------
.../java/org/apache/juneau/jena/RdfSerializer.java | 2 +-
.../main/java/org/apache/juneau/BeanPropertyMeta.java | 2 +-
.../main/java/org/apache/juneau/ConfigException.java | 2 +-
.../src/main/java/org/apache/juneau/ObjectMap.java | 2 +-
.../main/java/org/apache/juneau/PropertyStore.java | 4 ++--
.../main/java/org/apache/juneau/csv/CsvParser.java | 4 ++--
.../java/org/apache/juneau/dto/ResultSetList.java | 2 +-
.../org/apache/juneau/html/HtmlDocSerializer.java | 2 +-
.../main/java/org/apache/juneau/html/HtmlParser.java | 12 ++++++------
.../apache/juneau/html/HtmlSchemaDocSerializer.java | 2 +-
.../java/org/apache/juneau/html/HtmlSerializer.java | 2 +-
.../main/java/org/apache/juneau/ini/ConfigFile.java | 4 ++--
.../java/org/apache/juneau/ini/ConfigFileImpl.java | 2 +-
.../src/main/java/org/apache/juneau/ini/Section.java | 2 +-
.../java/org/apache/juneau/internal/JuneauLogger.java | 2 +-
.../main/java/org/apache/juneau/json/JsonParser.java | 12 ++++++------
.../org/apache/juneau/json/JsonSchemaSerializer.java | 2 +-
.../java/org/apache/juneau/serializer/Serializer.java | 2 +-
.../apache/juneau/serializer/SerializerContext.java | 4 ++--
.../org/apache/juneau/svl/VarResolverSession.java | 2 +-
.../main/java/org/apache/juneau/uon/UonParser.java | 14 +++++++-------
.../main/java/org/apache/juneau/uon/UonReader.java | 2 +-
.../juneau/urlencoding/UrlEncodingSerializer.java | 2 +-
.../main/java/org/apache/juneau/utils/PojoQuery.java | 2 +-
.../main/java/org/apache/juneau/utils/PojoRest.java | 6 +++---
.../main/java/org/apache/juneau/xml/XmlClassMeta.java | 2 +-
.../main/java/org/apache/juneau/xml/XmlParser.java | 4 ++--
.../org/apache/juneau/xml/XmlSchemaSerializer.java | 2 +-
.../org/apache/juneau/xml/XmlSerializerSession.java | 2 +-
.../juneau/examples/rest/CodeFormatterResource.java | 2 +-
.../apache/juneau/examples/rest/SqlQueryResource.java | 3 +--
.../examples/rest/SystemPropertiesResource.java | 1 +
.../apache/juneau/examples/rest/TempDirResource.java | 2 +-
.../juneau/examples/rest/UrlEncodedFormResource.java | 3 +--
.../apache/juneau/microservice/RestMicroservice.java | 2 +-
.../microservice/resources/LogEntryFormatter.java | 3 ++-
.../juneau/microservice/resources/LogParser.java | 2 +-
.../apache/juneau/rest/client/RestClientBuilder.java | 1 +
.../main/java/org/apache/juneau/rest/RestRequest.java | 2 +-
.../main/java/org/apache/juneau/rest/RestServlet.java | 6 +++---
41 files changed, 71 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
index 2d927dc..cdbb418 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfParser.java
@@ -194,7 +194,7 @@ public class RdfParser extends ReaderParser {
* Finds the roots in the model using either the "root" property to identify it,
* or by resorting to scanning the model for all nodes with no incoming predicates.
*/
- private List<Resource> getRoots(RdfParserSession session, Model m) {
+ private static List<Resource> getRoots(RdfParserSession session, Model m) {
List<Resource> l = new LinkedList<Resource>();
// First try to find the root using the "http://www.apache.org/juneau/root" property.
@@ -229,12 +229,9 @@ public class RdfParser extends ReaderParser {
RdfBeanMeta rbm = bm.getExtendedMeta(RdfBeanMeta.class);
if (rbm.hasBeanUri() && r2.getURI() != null)
rbm.getBeanUriProperty().set(m, r2.getURI());
- Property subTypeIdProperty = null;
for (StmtIterator i = r2.listProperties(); i.hasNext();) {
Statement st = i.next();
Property p = st.getPredicate();
- if (subTypeIdProperty != null && p.equals(subTypeIdProperty))
- continue;
String key = session.decodeString(p.getLocalName());
BeanPropertyMeta pMeta = m.getPropertyMeta(key);
session.setCurrentProperty(pMeta);
@@ -251,7 +248,7 @@ public class RdfParser extends ReaderParser {
setName(cm, value, key);
pMeta.set(m, value);
}
- } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()) || (subTypeIdProperty != null && p.equals(subTypeIdProperty)))) {
+ } else if (! (p.equals(session.getRootProperty()) || p.equals(session.getTypeProperty()))) {
onUnknownProperty(session, key, m, -1, -1);
}
session.setCurrentProperty(null);
@@ -259,7 +256,7 @@ public class RdfParser extends ReaderParser {
return m;
}
- private boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {
+ private static boolean isMultiValuedCollections(RdfParserSession session, BeanPropertyMeta pMeta) {
if (pMeta != null && pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() != RdfCollectionFormat.DEFAULT)
return pMeta.getExtendedMeta(RdfBeanPropertyMeta.class).getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;
return session.getCollectionFormat() == RdfCollectionFormat.MULTI_VALUED;
@@ -392,7 +389,7 @@ public class RdfParser extends ReaderParser {
return (T)o;
}
- private boolean isSeq(RdfParserSession session, RDFNode n) {
+ private static boolean isSeq(RdfParserSession session, RDFNode n) {
if (n.isResource()) {
Statement st = n.asResource().getProperty(session.getRdfTypeProperty());
if (st != null)
@@ -401,7 +398,7 @@ public class RdfParser extends ReaderParser {
return false;
}
- private boolean isBag(RdfParserSession session, RDFNode n) {
+ private static boolean isBag(RdfParserSession session, RDFNode n) {
if (n.isResource()) {
Statement st = n.asResource().getProperty(session.getRdfTypeProperty());
if (st != null)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
index 4de1963..7dcd043 100644
--- a/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
+++ b/juneau-core-rdf/src/main/java/org/apache/juneau/jena/RdfSerializer.java
@@ -321,7 +321,7 @@ public class RdfSerializer extends WriterSerializer {
return n;
}
- private String getUri(RdfSerializerSession session, Object uri, Object uri2) {
+ private static String getUri(RdfSerializerSession session, Object uri, Object uri2) {
String s = null;
if (uri != null)
s = uri.toString();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index d14e3d3..f16c7fe 100644
--- a/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -922,7 +922,7 @@ public class BeanPropertyMeta {
return o;
}
- private String findClassName(Object o) {
+ private static String findClassName(Object o) {
if (o == null)
return null;
if (o instanceof Class)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/ConfigException.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ConfigException.java b/juneau-core/src/main/java/org/apache/juneau/ConfigException.java
index a9af489..88a77c9 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ConfigException.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ConfigException.java
@@ -31,7 +31,7 @@ public class ConfigException extends FormattedRuntimeException {
}
@Override
- public ConfigException initCause(Throwable t) {
+ public synchronized ConfigException initCause(Throwable t) {
super.initCause(t);
return this;
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
index 08069a5..ff1d59e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ObjectMap.java
@@ -1161,7 +1161,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
* If c1 is a child of c2 or the same as c2, returns c1.
* Otherwise, returns c2.
*/
- private ClassMeta<?> getNarrowedClassMeta(ClassMeta<?> c1, ClassMeta<?> c2) {
+ private static ClassMeta<?> getNarrowedClassMeta(ClassMeta<?> c1, ClassMeta<?> c2) {
if (isParentClass(c2.getInnerClass(), c1.getInnerClass()))
return c1;
return c2;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java
index 2bfc27b..48d78eb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java
+++ b/juneau-core/src/main/java/org/apache/juneau/PropertyStore.java
@@ -1349,7 +1349,7 @@ public final class PropertyStore {
}
}
- private String prefix(String name) {
+ private static String prefix(String name) {
if (name == null)
throw new ConfigException("Invalid property name specified: 'null'");
if (name.indexOf('.') == -1)
@@ -1357,7 +1357,7 @@ public final class PropertyStore {
return name.substring(0, name.indexOf('.'));
}
- private String className(Object o) {
+ private static String className(Object o) {
if (o == null)
return null;
if (o instanceof Class)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/csv/CsvParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/csv/CsvParser.java b/juneau-core/src/main/java/org/apache/juneau/csv/CsvParser.java
index 753e85c..fd37dc5 100644
--- a/juneau-core/src/main/java/org/apache/juneau/csv/CsvParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/csv/CsvParser.java
@@ -25,7 +25,7 @@ public class CsvParser extends ReaderParser {
/** Default parser, all default settings.*/
public static final CsvParser DEFAULT = new CsvParser(PropertyStore.create());
-
+
/**
* Constructor.
* @param propertyStore The property store containing all the settings for this object.
@@ -40,7 +40,7 @@ public class CsvParser extends ReaderParser {
}
@SuppressWarnings("unused")
- private <T> T parseAnything(ParserSession session, ClassMeta<T> eType, ParserReader r, Object outer, BeanPropertyMeta pMeta) throws Exception {
+ private static <T> T parseAnything(ParserSession session, ClassMeta<T> eType, ParserReader r, Object outer, BeanPropertyMeta pMeta) throws Exception {
throw new NoSuchMethodException("Not implemented.");
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/dto/ResultSetList.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/dto/ResultSetList.java b/juneau-core/src/main/java/org/apache/juneau/dto/ResultSetList.java
index 22d06b6..d33afec 100644
--- a/juneau-core/src/main/java/org/apache/juneau/dto/ResultSetList.java
+++ b/juneau-core/src/main/java/org/apache/juneau/dto/ResultSetList.java
@@ -80,7 +80,7 @@ public final class ResultSetList extends LinkedList<Map<String,Object>> {
* @param dataType The {@link Types type} of the entry.
* @return The entry as an Object.
*/
- protected Object readEntry(ResultSet rs, int col, int dataType) {
+ protected static Object readEntry(ResultSet rs, int col, int dataType) {
try {
switch (dataType) {
case Types.BLOB:
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
index 7359699..03ca0ec 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlDocSerializer.java
@@ -167,7 +167,7 @@ public class HtmlDocSerializer extends HtmlStrippedDocSerializer {
w.eTag("body").nl().eTag("html").nl();
}
- private boolean isEmptyList(Object o) {
+ private static boolean isEmptyList(Object o) {
if (o == null)
return false;
if (o instanceof Collection && ((Collection<?>)o).size() == 0)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
index bce548c..ef73860 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlParser.java
@@ -256,7 +256,7 @@ public class HtmlParser extends XmlParser {
/*
* Reads an anchor tag and converts it into a bean.
*/
- private <T> T parseAnchor(HtmlParserSession session, XMLStreamReader r, ClassMeta<T> beanType) throws XMLStreamException {
+ private static <T> T parseAnchor(HtmlParserSession session, XMLStreamReader r, ClassMeta<T> beanType) throws XMLStreamException {
String href = r.getAttributeValue(null, "href");
String name = session.getElementText(r);
Class<T> beanClass = beanType.getInnerClass();
@@ -270,7 +270,7 @@ public class HtmlParser extends XmlParser {
return session.convertToType(href, beanType);
}
- private Map<String,String> getAttributes(XMLStreamReader r) {
+ private static Map<String,String> getAttributes(XMLStreamReader r) {
Map<String,String> m = new TreeMap<String,String>() ;
for (int i = 0; i < r.getAttributeCount(); i++)
m.put(r.getAttributeLocalName(i), r.getAttributeValue(i));
@@ -464,7 +464,7 @@ public class HtmlParser extends XmlParser {
* Precondition: Must be pointing before the event we want to parse.
* Postcondition: Pointing at the tag just parsed.
*/
- private HtmlTag nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {
+ private static HtmlTag nextTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {
int et = r.next();
while (et != START_ELEMENT && et != END_ELEMENT && et != END_DOCUMENT)
@@ -492,7 +492,7 @@ public class HtmlParser extends XmlParser {
* @param r The stream being read from.
* @throws XMLStreamException
*/
- private void skipTag(XMLStreamReader r) throws XMLStreamException {
+ private static void skipTag(XMLStreamReader r) throws XMLStreamException {
int et = r.getEventType();
if (et != START_ELEMENT)
@@ -517,7 +517,7 @@ public class HtmlParser extends XmlParser {
}
}
- private void skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {
+ private static void skipTag(XMLStreamReader r, HtmlTag...expected) throws XMLStreamException {
HtmlTag tag = HtmlTag.forEvent(r);
if (tag.isOneOf(expected))
r.next();
@@ -525,7 +525,7 @@ public class HtmlParser extends XmlParser {
throw new XMLStreamException("Unexpected tag: " + tag + ". Expected one of the following: " + JsonSerializer.DEFAULT.toString(expected), r.getLocation());
}
- private int skipWs(XMLStreamReader r) throws XMLStreamException {
+ private static int skipWs(XMLStreamReader r) throws XMLStreamException {
int event = r.getEventType();
while (event != START_ELEMENT && event != END_ELEMENT && event != END_DOCUMENT && r.isWhiteSpace())
event = r.next();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
index 582abcd..eea6616 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSchemaDocSerializer.java
@@ -150,7 +150,7 @@ public final class HtmlSchemaDocSerializer extends HtmlDocSerializer {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- private List<String> getEnumStrings(Class<? extends Enum> c) {
+ private static List<String> getEnumStrings(Class<? extends Enum> c) {
List<String> l = new LinkedList<String>();
for (Object e : EnumSet.allOf(c))
l.add(e.toString());
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
index de4768e..391d496 100644
--- a/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/html/HtmlSerializer.java
@@ -560,7 +560,7 @@ public class HtmlSerializer extends XmlSerializer {
* 2-dimensional tables are used for collections of objects that all have the same set of property names.
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
- private String[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {
+ private static String[] getTableHeaders(SerializerSession session, Collection c, HtmlBeanPropertyMeta hbpMeta) throws Exception {
if (c.size() == 0)
return null;
c = session.sort(c);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
index d8f18c1..40a0f9e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFile.java
@@ -455,7 +455,7 @@ public abstract class ConfigFile implements Map<String,Section> {
return put(getSectionName(key), getSectionKey(key), getSerializer().toString(value), encoded);
}
- private final boolean isSimpleType(Class<?> c) {
+ private static boolean isSimpleType(Class<?> c) {
return (c == String.class || c.isPrimitive() || c.isAssignableFrom(Number.class) || c == Boolean.class);
}
@@ -745,7 +745,7 @@ public abstract class ConfigFile implements Map<String,Section> {
}
- private int parseIntWithSuffix(String s) {
+ private static int parseIntWithSuffix(String s) {
assertFieldNotNull(s, "s");
int m = 1;
if (s.endsWith("M")) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
index e8da4c3..f1ef0eb 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/ConfigFileImpl.java
@@ -717,7 +717,7 @@ public final class ConfigFileImpl extends ConfigFile {
* Finds the keys that are different between the two sections and adds it to
* the specified set.
*/
- private void findChanges(Set<String> s, Section a, Section b) {
+ private static void findChanges(Set<String> s, Section a, Section b) {
if (s == null)
return;
String sname = (a == null ? b.name : a.name);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/ini/Section.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/ini/Section.java b/juneau-core/src/main/java/org/apache/juneau/ini/Section.java
index d75404b..8a53d3a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/ini/Section.java
+++ b/juneau-core/src/main/java/org/apache/juneau/ini/Section.java
@@ -550,7 +550,7 @@ public class Section implements Map<String,String> {
lock.writeLock().unlock();
}
- private String trimComment(String s) {
+ private static String trimComment(String s) {
return s.replaceAll("^\\s*\\#\\s*", "").trim();
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
index b89e32c..fe391b3 100644
--- a/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
+++ b/juneau-core/src/main/java/org/apache/juneau/internal/JuneauLogger.java
@@ -83,7 +83,7 @@ public class JuneauLogger extends java.util.logging.Logger {
* Both <js>'.'</js> and <js>'/'</js> can be used as path delimiters.
* @return A new <l>Logger</l>.
*/
- public static JuneauLogger getLogger(String name, String resourceBundleName) {
+ public static synchronized JuneauLogger getLogger(String name, String resourceBundleName) {
return new JuneauLogger(java.util.logging.Logger.getLogger(name, resourceBundleName));
}
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
index 24cd45e..173a5ec 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonParser.java
@@ -244,7 +244,7 @@ public class JsonParser extends ReaderParser {
return parseNumber(session, StringUtils.parseNumberString(r), type);
}
- private Number parseNumber(JsonParserSession session, String s, Class<? extends Number> type) throws Exception {
+ private static Number parseNumber(JsonParserSession session, String s, Class<? extends Number> type) throws Exception {
// JSON has slightly different number rules from Java.
// Strict mode enforces these different rules, lax does not.
@@ -663,7 +663,7 @@ public class JsonParser extends ReaderParser {
* Looks for the keywords true, false, or null.
* Throws an exception if any of these keywords are not found at the specified position.
*/
- private void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {
+ private static void parseKeyword(JsonParserSession session, String keyword, ParserReader r) throws Exception {
try {
String s = r.read(keyword.length());
if (s.equals(keyword))
@@ -680,7 +680,7 @@ public class JsonParser extends ReaderParser {
* the comments and whitespace. Otherwise, the cursor will be set to the last position of
* the comments and whitespace.
*/
- private void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {
+ private static void skipCommentsAndSpace(JsonParserSession session, ParserReader r) throws Exception {
int c = 0;
while ((c = r.read()) != -1) {
if (! session.isWhitespace(c)) {
@@ -750,7 +750,7 @@ public class JsonParser extends ReaderParser {
* Doesn't actually parse anything, but moves the position beyond the construct "}" when
* the @Json.wrapperAttr() annotation is used on a class.
*/
- private void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {
+ private static void skipWrapperAttrEnd(JsonParserSession session, ParserReader r) throws ParseException, IOException {
int c = 0;
while ((c = r.read()) != -1) {
if (! session.isWhitespace(c)) {
@@ -771,7 +771,7 @@ public class JsonParser extends ReaderParser {
* Doesn't actually parse anything, but when positioned at the beginning of comment,
* it will move the pointer to the last character in the comment.
*/
- private void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {
+ private static void skipComments(JsonParserSession session, ParserReader r) throws ParseException, IOException {
int c = r.read();
// "/* */" style comments
if (c == '*') {
@@ -794,7 +794,7 @@ public class JsonParser extends ReaderParser {
* Call this method after you've finished a parsing a string to make sure that if there's any
* remainder in the input, that it consists only of whitespace and comments.
*/
- private void validateEnd(JsonParserSession session, ParserReader r) throws Exception {
+ private static void validateEnd(JsonParserSession session, ParserReader r) throws Exception {
skipCommentsAndSpace(session, r);
int c = r.read();
if (c != -1 && c != ';') // var x = {...}; expressions can end with a semicolon.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
index c2c0c43..104d838 100644
--- a/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/json/JsonSchemaSerializer.java
@@ -149,7 +149,7 @@ public final class JsonSchemaSerializer extends JsonSerializer {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
- private List<String> getEnumStrings(Class<? extends Enum> c) {
+ private static List<String> getEnumStrings(Class<? extends Enum> c) {
List<String> l = new LinkedList<String>();
for (Object e : EnumSet.allOf(c))
l.add(e.toString());
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java b/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
index a655048..c92a861 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/Serializer.java
@@ -224,7 +224,7 @@ public abstract class Serializer extends CoreObject {
* @param array The array being converted.
* @return The array as a list.
*/
- protected final List<Object> toList(Class<?> type, Object array) {
+ protected static final List<Object> toList(Class<?> type, Object array) {
Class<?> componentType = type.getComponentType();
if (componentType.isPrimitive()) {
int l = Array.getLength(array);
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
index f3ea90f..fe2bb9a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
+++ b/juneau-core/src/main/java/org/apache/juneau/serializer/SerializerContext.java
@@ -353,7 +353,7 @@ public class SerializerContext extends BeanContext {
absolutePathUriBase = resolveAbsolutePathUriBase(ps.getProperty(SERIALIZER_absolutePathUriBase, String.class, ""));
}
- private String resolveRelativeUriBase(String s) {
+ private static String resolveRelativeUriBase(String s) {
if (StringUtils.isEmpty(s))
return null;
if (s.equals("/"))
@@ -363,7 +363,7 @@ public class SerializerContext extends BeanContext {
return s;
}
- private String resolveAbsolutePathUriBase(String s) {
+ private static String resolveAbsolutePathUriBase(String s) {
if (StringUtils.isEmpty(s))
return null;
if (StringUtils.endsWith(s, '/'))
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index 824e0e2..fc7e7c6 100644
--- a/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -107,7 +107,7 @@ public class VarResolverSession {
* Checks to see if string is of the simple form "$X{...}" with no embedded variables.
* This is a common case, and we can avoid using StringWriters.
*/
- private boolean isSimpleVar(String s) {
+ private static boolean isSimpleVar(String s) {
int S1 = 1; // Not in variable, looking for $
int S2 = 2; // Found $, Looking for {
int S3 = 3; // Found {, Looking for }
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java b/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
index ef4c95c..b4ed5ea 100644
--- a/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/uon/UonParser.java
@@ -492,7 +492,7 @@ public class UonParser extends ReaderParser {
return null; // Unreachable.
}
- private Object parseNull(UonParserSession session, ParserReader r) throws Exception {
+ private static Object parseNull(UonParserSession session, ParserReader r) throws Exception {
String s = parseString(session, r, false);
if ("ull".equals(s))
return null;
@@ -508,7 +508,7 @@ public class UonParser extends ReaderParser {
* @return The parsed object
* @throws Exception
*/
- protected final Object parseAttr(UonParserSession session, ParserReader r, boolean encoded) throws Exception {
+ protected static final Object parseAttr(UonParserSession session, ParserReader r, boolean encoded) throws Exception {
Object attr;
attr = parseAttrName(session, r, encoded);
return attr;
@@ -523,7 +523,7 @@ public class UonParser extends ReaderParser {
* @return The parsed attribute name.
* @throws Exception
*/
- protected final String parseAttrName(UonParserSession session, ParserReader r, boolean encoded) throws Exception {
+ protected static String parseAttrName(UonParserSession session, ParserReader r, boolean encoded) throws Exception {
// If string is of form 'xxx', we're looking for ' at the end.
// Otherwise, we're looking for '&' or '=' or WS or -1 denoting the end of this string.
@@ -597,7 +597,7 @@ public class UonParser extends ReaderParser {
* @return The parsed string.
* @throws Exception
*/
- protected final String parseString(UonParserSession session, ParserReader r, boolean isUrlParamValue) throws Exception {
+ protected static String parseString(UonParserSession session, ParserReader r, boolean isUrlParamValue) throws Exception {
// If string is of form 'xxx', we're looking for ' at the end.
// Otherwise, we're looking for ',' or ')' or -1 denoting the end of this string.
@@ -665,7 +665,7 @@ public class UonParser extends ReaderParser {
throw new ParseException(session, "Unmatched parenthesis");
}
- private Boolean parseBoolean(UonParserSession session, ParserReader r) throws Exception {
+ private static Boolean parseBoolean(UonParserSession session, ParserReader r) throws Exception {
String s = parseString(session, r, false);
if (s == null || s.equals("null"))
return null;
@@ -676,7 +676,7 @@ public class UonParser extends ReaderParser {
throw new ParseException(session, "Unrecognized syntax for boolean. ''{0}''.", s);
}
- private Number parseNumber(UonParserSession session, ParserReader r, Class<? extends Number> c) throws Exception {
+ private static Number parseNumber(UonParserSession session, ParserReader r, Class<? extends Number> c) throws Exception {
String s = parseString(session, r, false);
if (s == null)
return null;
@@ -687,7 +687,7 @@ public class UonParser extends ReaderParser {
* Call this method after you've finished a parsing a string to make sure that if there's any
* remainder in the input, that it consists only of whitespace and comments.
*/
- private void validateEnd(UonParserSession session, ParserReader r) throws Exception {
+ private static void validateEnd(UonParserSession session, ParserReader r) throws Exception {
while (true) {
int c = r.read();
if (c == -1)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/uon/UonReader.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/uon/UonReader.java b/juneau-core/src/main/java/org/apache/juneau/uon/UonReader.java
index eba2df4..169896e 100644
--- a/juneau-core/src/main/java/org/apache/juneau/uon/UonReader.java
+++ b/juneau-core/src/main/java/org/apache/juneau/uon/UonReader.java
@@ -183,7 +183,7 @@ public final class UonReader extends ParserReader {
return (h << 4) + l;
}
- private final int fromHexChar(int c) throws IOException {
+ private static final int fromHexChar(int c) throws IOException {
if (c >= '0' && c <= '9')
return c - '0';
if (c >= 'a' && c <= 'f')
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
index 950bbbd..665ff27 100644
--- a/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/urlencoding/UrlEncodingSerializer.java
@@ -252,7 +252,7 @@ public class UrlEncodingSerializer extends UonSerializer {
return out;
}
- private Map<Integer,Object> getCollectionMap(Collection<?> c) {
+ private static Map<Integer,Object> getCollectionMap(Collection<?> c) {
Map<Integer,Object> m = new TreeMap<Integer,Object>();
int i = 0;
for (Object o : c)
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
index 5249b17..4f76b5a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoQuery.java
@@ -347,7 +347,7 @@ public final class PojoQuery {
/*
* Sorts the specified list by the sort list.
*/
- private void doSort(List list, List sortList) {
+ private static void doSort(List list, List sortList) {
Map sort = new LinkedHashMap();
for (Object s : sortList) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
index 12de791..e7d1e4c 100644
--- a/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
+++ b/juneau-core/src/main/java/org/apache/juneau/utils/PojoRest.java
@@ -570,7 +570,7 @@ public final class PojoRest {
}
/** Handle nulls and strip off leading '/' char. */
- private String normalizeUrl(String url) {
+ private static String normalizeUrl(String url) {
// Interpret nulls and blanks the same (i.e. as addressing the root itself)
if (url == null)
@@ -744,7 +744,7 @@ public final class PojoRest {
return a2;
}
- private Object[] removeArrayEntry(Object o, int index) {
+ private static Object[] removeArrayEntry(Object o, int index) {
Object[] a = (Object[])o;
// Shrink the array.
Object[] a2 = (Object[])Array.newInstance(a.getClass().getComponentType(), a.length-1);
@@ -834,7 +834,7 @@ public final class PojoRest {
return in;
}
- private int parseInt(String key) {
+ private static int parseInt(String key) {
try {
return Integer.parseInt(key);
} catch (NumberFormatException e) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
index c32cfa9..fb0a9c2 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlClassMeta.java
@@ -95,7 +95,7 @@ public class XmlClassMeta extends ClassMetaExtended {
return namespace;
}
- private Namespace findNamespace(Class<?> c) {
+ private static Namespace findNamespace(Class<?> c) {
if (c == null)
return null;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
index 7a325c7..69d3da1 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlParser.java
@@ -262,7 +262,7 @@ public class XmlParser extends ReaderParser {
return o;
}
- private int getJsonType(String s) {
+ private static int getJsonType(String s) {
if (s == null)
return UNKNOWN;
char c = s.charAt(0);
@@ -422,7 +422,7 @@ public class XmlParser extends ReaderParser {
return m;
}
- private void skipCurrentTag(XMLStreamReader r) throws XMLStreamException {
+ private static void skipCurrentTag(XMLStreamReader r) throws XMLStreamException {
int depth = 1;
do {
int event = r.next();
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
index 1cd340f..740ff3a 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSchemaSerializer.java
@@ -559,7 +559,7 @@ public class XmlSchemaSerializer extends XmlSerializer {
}
}
- private <T> T first(T...tt) {
+ private static <T> T first(T...tt) {
for (T t : tt)
if (t != null)
return t;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
index 824b01e..723c492 100644
--- a/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
+++ b/juneau-core/src/main/java/org/apache/juneau/xml/XmlSerializerSession.java
@@ -81,7 +81,7 @@ public class XmlSerializerSession extends SerializerSession {
}
}
- private Namespace findDefaultNamespace(String s) {
+ private static Namespace findDefaultNamespace(String s) {
if (s == null)
return null;
if (StringUtils.startsWith(s, '{'))
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
index 5bf4187..fb3d3fa 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/CodeFormatterResource.java
@@ -48,7 +48,7 @@ public class CodeFormatterResource extends Resource {
return highlight(code, lang);
}
- private String highlight(String code, String lang) throws Exception {
+ private static String highlight(String code, String lang) throws Exception {
if (lang.equalsIgnoreCase("xml")) {
code = code.replaceAll("&", "&");
code = code.replaceAll("<", "<");
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
index f147905..bd270d9 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SqlQueryResource.java
@@ -16,7 +16,6 @@ import static javax.servlet.http.HttpServletResponse.*;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
import static org.apache.juneau.html.HtmlDocSerializerContext.*;
-import java.io.*;
import java.sql.*;
import java.util.*;
@@ -64,7 +63,7 @@ public class SqlQueryResource extends Resource {
/** GET request handler - Display the query entry page. */
@RestMethod(name="GET", path="/")
- public Div doGet(RestRequest req) throws IOException {
+ public Div doGet(RestRequest req) {
return div(
script("text/javascript",
"\n // Quick and dirty function to allow tabs in textarea."
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
index 06bb64b..538ac73 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/SystemPropertiesResource.java
@@ -147,6 +147,7 @@ public class SystemPropertiesResource extends Resource {
return new Redirect();
}
+ @Override
@RestMethod(
name="OPTIONS", path="/*",
summary="Show resource options",
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
index 1bfe76b..70c7b73 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/TempDirResource.java
@@ -46,7 +46,7 @@ public class TempDirResource extends DirectoryResource {
* [GET /upload] - Display the form entry page for uploading a file to the temp directory.
*/
@RestMethod(name="GET", path="/upload")
- public Form getUploadForm(RestRequest req) throws IOException {
+ public Form getUploadForm(RestRequest req) {
return
form().id("form").action(req.getServletURI() + "/upload").method("POST").enctype("multipart/form-data")
.children(
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
----------------------------------------------------------------------
diff --git a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
index d836395..3f548b0 100644
--- a/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
+++ b/juneau-examples-rest/src/main/java/org/apache/juneau/examples/rest/UrlEncodedFormResource.java
@@ -15,7 +15,6 @@ package org.apache.juneau.examples.rest;
import static org.apache.juneau.dto.html5.HtmlBuilder.*;
import static org.apache.juneau.html.HtmlDocSerializerContext.*;
-import java.io.*;
import java.util.*;
import org.apache.juneau.annotation.*;
@@ -43,7 +42,7 @@ public class UrlEncodedFormResource extends Resource {
/** GET request handler */
@RestMethod(name="GET", path="/")
- public Div doGet(RestRequest req) throws IOException {
+ public Div doGet(RestRequest req) {
return div(
script("text/javascript",
"\n // Load results from IFrame into this document."
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/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 cc30dcd..292e99f 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
@@ -394,7 +394,7 @@ public class RestMicroservice extends Microservice {
return server;
}
- private int findOpenPort(int[] ports) {
+ private static int findOpenPort(int[] ports) {
for (int port : ports) {
try {
// If port is 0, try a random port between ports[0] and 32767.
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
index 05d3a31..312dff1 100644
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogEntryFormatter.java
@@ -150,6 +150,7 @@ public class LogEntryFormatter extends Formatter {
fieldIndexes.put("exception", index++);
re.append("(.*)");
break;
+ default: // Fall through.
}
} else {
re.append("\\%").append(format.substring(i1, i));
@@ -242,7 +243,7 @@ public class LogEntryFormatter extends Formatter {
return s;
}
- private String hashCode(Throwable t) {
+ private static String hashCode(Throwable t) {
int i = 0;
while (t != null) {
for (StackTraceElement e : t.getStackTrace())
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
----------------------------------------------------------------------
diff --git a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
index 67cd834..50b6999 100644
--- a/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
+++ b/juneau-microservice/src/main/java/org/apache/juneau/microservice/resources/LogParser.java
@@ -219,7 +219,7 @@ public class LogParser implements Iterable<LogParser.Entry>, Iterator<LogParser.
}
}
- private String toHtml(String s) {
+ private static String toHtml(String s) {
if (s.indexOf('<') != -1)
return s.replaceAll("<", "<"); //$NON-NLS-1$//$NON-NLS-2$
return s;
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
----------------------------------------------------------------------
diff --git a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
index bacbe66..0075437 100644
--- a/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
+++ b/juneau-rest-client/src/main/java/org/apache/juneau/rest/client/RestClientBuilder.java
@@ -202,6 +202,7 @@ public class RestClientBuilder extends CoreObjectBuilder {
switch (sslOpts.getHostVerify()) {
case LAX: hv = new NoopHostnameVerifier(); break;
case DEFAULT: hv = new DefaultHostnameVerifier(); break;
+ default: throw new RuntimeException("Programmer error");
}
for (String p : StringUtils.split(sslOpts.getProtocols(), ',')) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
index 0e907c3..cc60feb 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestRequest.java
@@ -1927,7 +1927,7 @@ public final class RestRequest extends HttpServletRequestWrapper {
/*
* Converts an Accept-Language value entry to a Locale.
*/
- private Locale toLocale(String lang) {
+ private static Locale toLocale(String lang) {
String country = "";
int i = lang.indexOf('-');
if (i > -1) {
http://git-wip-us.apache.org/repos/asf/incubator-juneau/blob/6e3f3e15/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
----------------------------------------------------------------------
diff --git a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
index 83c9bcc..f876360 100644
--- a/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
+++ b/juneau-rest/src/main/java/org/apache/juneau/rest/RestServlet.java
@@ -843,7 +843,7 @@ public abstract class RestServlet extends HttpServlet {
return this.parentResource;
}
- private String[] parseHeader(String s) {
+ private static String[] parseHeader(String s) {
int i = s.indexOf(':');
if (i == -1)
return null;
@@ -2041,7 +2041,7 @@ public abstract class RestServlet extends HttpServlet {
/**
* Throws an exception if the specified type isn't an array or collection.
*/
- private void assertCollection(Type t, Method m) throws ServletException {
+ private static void assertCollection(Type t, Method m) throws ServletException {
ClassMeta<?> cm = BeanContext.DEFAULT.getClassMeta(t);
if (! cm.isCollectionOrArray())
throw new ServletException("Use of multipart flag on parameter that's not an array or Collection on method" + m);
@@ -2075,8 +2075,8 @@ public abstract class RestServlet extends HttpServlet {
case PATHREMAINDER: return req.getPathRemainder();
case PROPS: return res.getProperties();
case MESSAGES: return req.getResourceBundle();
+ default: return null;
}
- return null;
}
}