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 2019/07/02 00:23:07 UTC
[juneau] branch master updated: Fix compiler warnings.
This is an automated email from the ASF dual-hosted git repository.
jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
The following commit(s) were added to refs/heads/master by this push:
new 4b9e77d Fix compiler warnings.
4b9e77d is described below
commit 4b9e77d1df7d9becf8bac22bdd18dff17536db5d
Author: JamesBognar <ja...@apache.org>
AuthorDate: Mon Jul 1 20:21:20 2019 -0400
Fix compiler warnings.
---
.../src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java | 2 +-
.../juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java | 6 +++---
.../src/main/java/org/apache/juneau/PropertyStoreBuilder.java | 3 ++-
.../src/main/java/org/apache/juneau/html/HtmlSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/http/MediaType.java | 2 +-
.../src/main/java/org/apache/juneau/httppart/HttpPartSchema.java | 2 +-
.../src/main/java/org/apache/juneau/internal/DelegateMap.java | 1 +
.../src/main/java/org/apache/juneau/internal/StringUtils.java | 2 +-
.../main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java | 2 +-
.../src/main/java/org/apache/juneau/pojotools/PojoSearcher.java | 1 +
.../src/main/java/org/apache/juneau/svl/VarResolverBuilder.java | 1 +
.../src/main/java/org/apache/juneau/utils/ProcBuilder.java | 2 +-
.../juneau-examples-rest-springboot.launch | 1 -
.../juneau-microservice-ftest/juneau-microservice-test.launch | 2 ++
.../main/java/org/apache/juneau/rest/mock/MockServletResponse.java | 2 +-
.../src/main/java/org/apache/juneau/rest/vars/WidgetVar.java | 1 +
16 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
index 7a9665a..3027870 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SwaggerElement.java
@@ -142,7 +142,7 @@ public abstract class SwaggerElement {
*/
@BeanProperty("*")
public Set<String> extraKeys() {
- return extra == null ? Collections.EMPTY_SET : extra.keySet();
+ return extra == null ? Collections.emptySet() : extra.keySet();
}
/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
index c941b13..c459b7e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ObjectMap.java
@@ -116,12 +116,12 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
@Override /* Map */
public Set<Map.Entry<String,Object>> entrySet() {
- return Collections.EMPTY_MAP.entrySet();
+ return Collections.<String,Object>emptyMap().entrySet();
}
@Override /* Map */
public Set<String> keySet() {
- return Collections.EMPTY_MAP.keySet();
+ return Collections.<String,Object>emptyMap().keySet();
}
@Override /* Map */
@@ -581,7 +581,7 @@ public class ObjectMap extends LinkedHashMap<String,Object> {
if (o == null)
return null;
PojoSwap swap = pojoSwap;
- return (T)swap.unswap(bs(), o, null);
+ return (T) swap.unswap(bs(), o, null);
} catch (ParseException e) {
throw e;
} catch (Exception e) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
index 03dc005..b8e8978 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStoreBuilder.java
@@ -473,7 +473,7 @@ public class PropertyStoreBuilder {
final Map<String,MutableProperty> properties = new ConcurrentSkipListMap<>();
PropertyGroupBuilder() {
- this(EMPTY_MAP);
+ this(emptyMap());
}
synchronized void apply(PropertyGroup copyFrom) {
@@ -844,6 +844,7 @@ public class PropertyStoreBuilder {
add(e.getKey(), e.getValue());
}
+ @SuppressWarnings("unchecked")
@Override /* MutableProperty */
synchronized void add(String arg, Object o) {
if (arg != null) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
index 8ffa083..e920d2e 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/html/HtmlSerializerSession.java
@@ -370,7 +370,7 @@ public class HtmlSerializerSession extends XmlSerializerSession {
return cr;
}
- @SuppressWarnings({ "rawtypes" })
+ @SuppressWarnings({ "rawtypes", "unchecked" })
private void serializeMap(XmlWriter out, Map m, ClassMeta<?> sType,
ClassMeta<?> eKeyType, ClassMeta<?> eValueType, String typeName, BeanPropertyMeta ppMeta) throws Exception {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
index 7a3d4ea..4e6afc1 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/http/MediaType.java
@@ -145,7 +145,7 @@ public class MediaType implements Comparable<MediaType> {
i = mt.indexOf(';');
if (i == -1) {
- this.parameters = Collections.EMPTY_MAP;
+ this.parameters = Collections.emptyMap();
} else {
this.parameters = new TreeMap<>();
String[] tokens = mt.substring(i+1).split(";");
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
index aae1997..abe22dd 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/httppart/HttpPartSchema.java
@@ -1245,7 +1245,7 @@ public class HttpPartSchema {
}
private static <T> Set<T> copy(Set<T> in) {
- return in == null ? Collections.EMPTY_SET : unmodifiableSet(new LinkedHashSet<>(in));
+ return in == null ? Collections.emptySet() : unmodifiableSet(new LinkedHashSet<>(in));
}
private static Map<String,HttpPartSchema> build(Map<String,HttpPartSchemaBuilder> in, boolean noValidate) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
index 1ab4755..48f807c 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DelegateMap.java
@@ -33,6 +33,7 @@ public class DelegateMap<T extends Map> extends ObjectMap implements Delegate<T>
* @param m The metadata object that created this delegate object.
* @param session
*/
+ @SuppressWarnings("unchecked")
public DelegateMap(T m, BeanSession session) {
this.classMeta = session.getClassMetaForObject(m);
for (Map.Entry e : (Set<Map.Entry>)m.entrySet())
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
index 747b0d4..edc522a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/StringUtils.java
@@ -676,7 +676,7 @@ public final class StringUtils {
if (s == null)
return null;
if (isEmpty(s))
- return Collections.EMPTY_MAP;
+ return Collections.emptyMap();
Map<String,String> m = new LinkedHashMap<>();
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
index 1374fe7..e619e4b 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/oapi/OpenApiSerializerSession.java
@@ -214,7 +214,7 @@ public class OpenApiSerializerSession extends UonSerializerSession {
return out;
}
- @SuppressWarnings("rawtypes")
+ @SuppressWarnings({ "rawtypes", "unchecked" })
private Map toMap(HttpPartType partType, ClassMeta<?> type, Object o, HttpPartSchema s) throws SerializeException, SchemaValidationException {
if (s == null)
s = DEFAULT_SCHEMA;
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/PojoSearcher.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/PojoSearcher.java
index 739e416..4816d72 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/PojoSearcher.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/pojotools/PojoSearcher.java
@@ -96,6 +96,7 @@ public final class PojoSearcher implements PojoTool<SearchArgs> {
Map<String,ColumnMatcher> entryMatchers = new HashMap<>();
BeanSession bs;
+ @SuppressWarnings("unchecked")
RowMatcher(BeanSession bs, Map query) {
this.bs = bs;
for (Map.Entry e : (Set<Map.Entry>)query.entrySet())
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverBuilder.java
index f74785a..81dac6d 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/svl/VarResolverBuilder.java
@@ -36,6 +36,7 @@ public class VarResolverBuilder {
*
* @return A new var resolver.
*/
+ @SuppressWarnings("unchecked")
public VarResolver build() {
return new VarResolver(vars.toArray(new Class[vars.size()]), contextObjects);
}
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
index a4be2b4..f724fa5 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ProcBuilder.java
@@ -247,7 +247,7 @@ public class ProcBuilder {
* @param env The new set of environment variables.
* @return This object (for method chaining).
*/
- @SuppressWarnings({"rawtypes"})
+ @SuppressWarnings({"rawtypes", "unchecked"})
public ProcBuilder env(Map env) {
if (env != null)
for (Map.Entry e : (Set<Map.Entry>)env.entrySet())
diff --git a/juneau-examples/juneau-examples-rest-springboot/juneau-examples-rest-springboot.launch b/juneau-examples/juneau-examples-rest-springboot/juneau-examples-rest-springboot.launch
index 60c4232..29e66fc 100644
--- a/juneau-examples/juneau-examples-rest-springboot/juneau-examples-rest-springboot.launch
+++ b/juneau-examples/juneau-examples-rest-springboot/juneau-examples-rest-springboot.launch
@@ -15,4 +15,3 @@
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-examples-rest-springboot"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
-
diff --git a/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch b/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch
index 76eaafc..d42cc79 100644
--- a/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch
+++ b/juneau-microservice/juneau-microservice-ftest/juneau-microservice-test.launch
@@ -9,8 +9,10 @@
<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+ <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.juneau.microservice.jetty.JettyMicroservice"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="juneau-microservice-test.cfg"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="juneau-microservice-ftest"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
index f00f261..54ef0be 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/mock/MockServletResponse.java
@@ -250,7 +250,7 @@ public class MockServletResponse implements HttpServletResponse, MockHttpRespons
@Override /* HttpServletResponse */
public Collection<String> getHeaders(String name) {
String[] s = headerMap.get(name);
- return s == null ? Collections.EMPTY_LIST : Arrays.asList(s);
+ return s == null ? Collections.emptyList() : Arrays.asList(s);
}
@Override /* HttpServletResponse */
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
index 7b40847..16b770b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/vars/WidgetVar.java
@@ -60,6 +60,7 @@ public class WidgetVar extends SimpleVar {
super(NAME);
}
+ @SuppressWarnings("unchecked")
@Override /* Var */
public String resolve(VarResolverSession session, String key) throws Exception {
RestRequest req = session.getSessionObject(RestRequest.class, SESSION_req, true);