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/10/26 23:22:10 UTC
[7/8] juneau git commit: Update code to reflect changes in Java 7.
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
index 6be8583..5ce1c60 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/cognos/DataSet.java
@@ -98,7 +98,7 @@ public class DataSet {
*/
public DataSet(Column[] columns, Object o, BeanSession session) throws Exception {
metaData = columns;
- data = new LinkedList<Row>();
+ data = new LinkedList<>();
if (o != null) {
if (o.getClass().isArray())
o = Arrays.asList((Object[])o);
@@ -140,7 +140,7 @@ public class DataSet {
*/
@Bean(typeName="row")
public static class Row {
- private List<String> values = new LinkedList<String>();
+ private List<String> values = new LinkedList<>();
private void add(String value) {
values.add(value);
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
index 543d2ee..1f93e87 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElement.java
@@ -85,7 +85,7 @@ public abstract class HtmlElement {
*/
public HtmlElement attr(String key, Object val) {
if (this.attrs == null)
- this.attrs = new LinkedHashMap<String,Object>();
+ this.attrs = new LinkedHashMap<>();
if ("url".equals(key) || "href".equals(key) || key.endsWith("action"))
val = StringUtils.toURI(val);
this.attrs.put(key, val);
@@ -112,7 +112,7 @@ public abstract class HtmlElement {
*/
public HtmlElement attrUri(String key, Object val) {
if (this.attrs == null)
- this.attrs = new LinkedHashMap<String,Object>();
+ this.attrs = new LinkedHashMap<>();
this.attrs.put(key, StringUtils.toURI(val));
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
index a74fcea..d504dbd 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementContainer.java
@@ -126,7 +126,7 @@ public class HtmlElementContainer extends HtmlElement {
public HtmlElement children(Object...children) {
if (children.length > 0) {
if (this.children == null)
- this.children = new LinkedList<Object>();
+ this.children = new LinkedList<>();
for (Object c : children)
this.children.add(c);
}
@@ -141,7 +141,7 @@ public class HtmlElementContainer extends HtmlElement {
*/
public HtmlElement child(Object child) {
if (this.children == null)
- this.children = new LinkedList<Object>();
+ this.children = new LinkedList<>();
this.children.add(child);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
index e75f853..7c3a0fb 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/html5/HtmlElementMixed.java
@@ -145,7 +145,7 @@ public class HtmlElementMixed extends HtmlElement {
*/
public HtmlElement child(Object child) {
if (this.children == null)
- this.children = new LinkedList<Object>();
+ this.children = new LinkedList<>();
if (child instanceof Collection)
this.children.addAll((Collection<?>)child);
else
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
index a2d3cf9..dc4b105 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/Schema.java
@@ -361,7 +361,7 @@ public class Schema {
*/
public Schema addDefinition(String name, Schema definition) {
if (this.definitions == null)
- this.definitions = new LinkedHashMap<String,Schema>();
+ this.definitions = new LinkedHashMap<>();
this.definitions.put(name, definition);
setMasterOn(definition);
return this;
@@ -443,7 +443,7 @@ public class Schema {
*/
public Schema addProperties(Schema...properties) {
if (this.properties == null)
- this.properties = new LinkedHashMap<String,Schema>();
+ this.properties = new LinkedHashMap<>();
for (Schema p : properties) {
if (p.getName() == null)
throw new BeanRuntimeException(Schema.class,
@@ -494,7 +494,7 @@ public class Schema {
*/
public Schema addPatternProperties(SchemaProperty...properties) {
if (this.patternProperties == null)
- this.patternProperties = new LinkedHashMap<String,Schema>();
+ this.patternProperties = new LinkedHashMap<>();
for (Schema p : properties) {
if (p.getName() == null)
throw new BeanRuntimeException(Schema.class,
@@ -537,7 +537,7 @@ public class Schema {
*/
public Schema addDependency(String name, Schema dependency) {
if (this.dependencies == null)
- this.dependencies = new LinkedHashMap<String,Schema>();
+ this.dependencies = new LinkedHashMap<>();
this.dependencies.put(name, dependency);
setMasterOn(dependency);
return this;
@@ -1065,7 +1065,7 @@ public class Schema {
*/
public Schema addRequired(List<String> required) {
if (this.required == null)
- this.required = new LinkedList<String>();
+ this.required = new LinkedList<>();
for (String r : required)
this.required.add(r);
return this;
@@ -1079,7 +1079,7 @@ public class Schema {
*/
public Schema addRequired(String...required) {
if (this.required == null)
- this.required = new LinkedList<String>();
+ this.required = new LinkedList<>();
for (String r : required)
this.required.add(r);
return this;
@@ -1093,7 +1093,7 @@ public class Schema {
*/
public Schema addRequired(SchemaProperty...properties) {
if (this.required == null)
- this.required = new LinkedList<String>();
+ this.required = new LinkedList<>();
for (SchemaProperty p : properties)
this.required.add(p.getName());
return this;
@@ -1228,7 +1228,7 @@ public class Schema {
*/
public Schema addEnum(String..._enum) {
if (this._enum == null)
- this._enum = new LinkedList<String>();
+ this._enum = new LinkedList<>();
for (String e : _enum)
this._enum.add(e);
return this;
@@ -1263,7 +1263,7 @@ public class Schema {
*/
public Schema addAllOf(Schema...allOf) {
if (this.allOf == null)
- this.allOf = new LinkedList<Schema>();
+ this.allOf = new LinkedList<>();
setMasterOn(allOf);
for (Schema s : allOf)
this.allOf.add(s);
@@ -1299,7 +1299,7 @@ public class Schema {
*/
public Schema addAnyOf(Schema...anyOf) {
if (this.anyOf == null)
- this.anyOf = new LinkedList<Schema>();
+ this.anyOf = new LinkedList<>();
setMasterOn(anyOf);
for (Schema s : anyOf)
this.anyOf.add(s);
@@ -1335,7 +1335,7 @@ public class Schema {
*/
public Schema addOneOf(Schema...oneOf) {
if (this.oneOf == null)
- this.oneOf = new LinkedList<Schema>();
+ this.oneOf = new LinkedList<>();
setMasterOn(oneOf);
for (Schema s : oneOf)
this.oneOf.add(s);
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
index 46e72ff..fe078b2 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/jsonschema/SchemaMap.java
@@ -119,19 +119,12 @@ public abstract class SchemaMap extends ConcurrentHashMap<URI,Schema> {
* @return The parsed schema.
*/
public Schema load(URI uri) {
- Reader r = getReader(uri);
- if (r == null)
- return null;
- try {
+ try (Reader r = getReader(uri)) {
+ if (r == null)
+ return null;
return JsonParser.DEFAULT.parse(r, Schema.class);
} catch (Exception e) {
throw new RuntimeException(e);
- } finally {
- try {
- r.close();
- } catch (IOException e) {
- // Ignore
- }
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
index 4df9d90..ef01f78 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/HeaderInfo.java
@@ -774,7 +774,7 @@ public class HeaderInfo extends SwaggerElement {
addEnum((Collection<Object>)o);
else {
if (this._enum == null)
- this._enum = new LinkedList<Object>();
+ this._enum = new LinkedList<>();
this._enum.add(o);
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
index 6ea857a..6aafda4 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Items.java
@@ -739,7 +739,7 @@ public class Items extends SwaggerElement {
addEnum((Collection<Object>)o);
else {
if (this._enum == null)
- this._enum = new LinkedList<Object>();
+ this._enum = new LinkedList<>();
this._enum.add(o);
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
index 9342ffb..ec00295 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Operation.java
@@ -166,7 +166,7 @@ public class Operation extends SwaggerElement {
public Operation addTags(Collection<String> tags) {
if (tags != null) {
if (this.tags == null)
- this.tags = new LinkedList<String>();
+ this.tags = new LinkedList<>();
this.tags.addAll(tags);
}
return this;
@@ -412,7 +412,7 @@ public class Operation extends SwaggerElement {
public Operation addConsumes(Collection<MediaType> consumes) {
if (consumes != null) {
if (this.consumes == null)
- this.consumes = new LinkedList<MediaType>();
+ this.consumes = new LinkedList<>();
this.consumes.addAll(consumes);
}
return this;
@@ -485,7 +485,7 @@ public class Operation extends SwaggerElement {
public Operation addProduces(MediaType...produces) {
if (produces != null) {
if (this.produces == null)
- this.produces = new LinkedList<MediaType>();
+ this.produces = new LinkedList<>();
this.produces.addAll(Arrays.asList(produces));
}
return this;
@@ -506,7 +506,7 @@ public class Operation extends SwaggerElement {
public Operation addProduces(Collection<MediaType> produces) {
if (produces != null) {
if (this.produces == null)
- this.produces = new LinkedList<MediaType>();
+ this.produces = new LinkedList<>();
this.produces.addAll(produces);
}
return this;
@@ -597,7 +597,7 @@ public class Operation extends SwaggerElement {
*/
public Operation addParameters(ParameterInfo...parameters) {
if (this.parameters == null)
- this.parameters = new LinkedList<ParameterInfo>();
+ this.parameters = new LinkedList<>();
this.parameters.addAll(Arrays.asList(parameters));
return this;
}
@@ -660,7 +660,7 @@ public class Operation extends SwaggerElement {
*/
public Operation addResponse(Integer statusCode, ResponseInfo response) {
if (responses == null)
- responses = new TreeMap<Integer,ResponseInfo>();
+ responses = new TreeMap<>();
responses.put(statusCode, response);
return this;
}
@@ -744,7 +744,7 @@ public class Operation extends SwaggerElement {
*/
public Operation addSchemes(Collection<String> schemes) {
if (this.schemes == null)
- this.schemes = new LinkedList<String>();
+ this.schemes = new LinkedList<>();
this.schemes.addAll(schemes);
return this;
}
@@ -848,7 +848,7 @@ public class Operation extends SwaggerElement {
*/
public Operation addSecurity(Map<String,List<String>> security) {
if (this.security == null)
- this.security = new LinkedList<Map<String,List<String>>>();
+ this.security = new LinkedList<>();
this.security.add(security);
return this;
}
@@ -863,7 +863,7 @@ public class Operation extends SwaggerElement {
* @return This object (for method chaining).
*/
public Operation security(String scheme, String...alternatives) {
- Map<String,List<String>> m = new LinkedHashMap<String,List<String>>();
+ Map<String,List<String>> m = new LinkedHashMap<>();
m.put(scheme, Arrays.asList(alternatives));
return addSecurity(m);
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
index 7707a5c..89004f9 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ParameterInfo.java
@@ -1088,7 +1088,7 @@ public class ParameterInfo extends SwaggerElement {
addEnum((Collection<Object>)o);
else {
if (this._enum == null)
- this._enum = new LinkedList<Object>();
+ this._enum = new LinkedList<>();
this._enum.add(o);
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
index 622da2d..71461a3 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/ResponseInfo.java
@@ -187,7 +187,7 @@ public class ResponseInfo extends SwaggerElement {
*/
public ResponseInfo addHeader(String name, HeaderInfo header) {
if (headers == null)
- headers = new TreeMap<String,HeaderInfo>();
+ headers = new TreeMap<>();
headers.put(name, header);
return this;
}
@@ -247,7 +247,7 @@ public class ResponseInfo extends SwaggerElement {
*/
public ResponseInfo addExample(String mimeType, Object example) {
if (examples == null)
- examples = new TreeMap<String,Object>();
+ examples = new TreeMap<>();
examples.put(mimeType, example);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
index 4ff4094..a2bc4c1 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SchemaInfo.java
@@ -679,7 +679,7 @@ public class SchemaInfo extends SwaggerElement {
addEnum((Collection<Object>)o);
else {
if (this._enum == null)
- this._enum = new LinkedList<Object>();
+ this._enum = new LinkedList<>();
this._enum.add(o);
}
}
@@ -794,7 +794,7 @@ public class SchemaInfo extends SwaggerElement {
addAllOf((Collection<Object>)o);
else {
if (this.allOf == null)
- this.allOf = new LinkedList<Object>();
+ this.allOf = new LinkedList<>();
this.allOf.add(o);
}
}
@@ -843,7 +843,7 @@ public class SchemaInfo extends SwaggerElement {
*/
public SchemaInfo addProperty(String name, Map<String,Object> propertyProperties) {
if (this.properties == null)
- this.properties = new TreeMap<String,Map<String,Object>>();
+ this.properties = new TreeMap<>();
this.properties.put(name, propertyProperties);
return this;
}
@@ -858,7 +858,7 @@ public class SchemaInfo extends SwaggerElement {
public SchemaInfo property(String name, Object...propertyProperties) {
if (propertyProperties.length % 2 != 0)
throw new RuntimeException("Invalid number of arguments passed to SchemaInfo.property(String,Object...)");
- Map<String,Object> m = new LinkedHashMap<String,Object>();
+ Map<String,Object> m = new LinkedHashMap<>();
for (int i = 0; i < propertyProperties.length; i += 2)
m.put(String.valueOf(propertyProperties[i]), propertyProperties[i+1]);
return addProperty(name, m);
@@ -895,7 +895,7 @@ public class SchemaInfo extends SwaggerElement {
public SchemaInfo additionalProperties(Object...additionalProperties) {
if (additionalProperties.length % 2 != 0)
throw new RuntimeException("Invalid number of arguments passed to SchemaInfo.additionalProperties(Object...)");
- Map<String,Object> m = new LinkedHashMap<String,Object>();
+ Map<String,Object> m = new LinkedHashMap<>();
for (int i = 0; i < additionalProperties.length; i += 2)
m.put(String.valueOf(additionalProperties[i]), additionalProperties[i+1]);
return setAdditionalProperties(m);
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
index e95b7a2..a7e2541 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/SecurityScheme.java
@@ -409,7 +409,7 @@ public class SecurityScheme extends SwaggerElement {
*/
public SecurityScheme addScope(String name, String description) {
if (scopes == null)
- scopes = new TreeMap<String,String>();
+ scopes = new TreeMap<>();
scopes.put(name, description);
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
index 1fe86b6..f559ec5 100644
--- a/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
+++ b/juneau-core/juneau-dto/src/main/java/org/apache/juneau/dto/swagger/Swagger.java
@@ -313,7 +313,7 @@ public class Swagger extends SwaggerElement {
public Swagger addSchemes(Collection<String> schemes) {
if (schemes != null) {
if (this.schemes == null)
- this.schemes = new LinkedList<String>();
+ this.schemes = new LinkedList<>();
this.schemes.addAll(schemes);
}
return this;
@@ -400,7 +400,7 @@ public class Swagger extends SwaggerElement {
public Swagger addConsumes(Collection<MediaType> consumes) {
if (consumes != null) {
if (this.consumes == null)
- this.consumes = new LinkedList<MediaType>();
+ this.consumes = new LinkedList<>();
this.consumes.addAll(consumes);
}
return this;
@@ -497,7 +497,7 @@ public class Swagger extends SwaggerElement {
public Swagger addProduces(Collection<MediaType> produces) {
if (produces != null) {
if (this.produces == null)
- this.produces = new LinkedList<MediaType>();
+ this.produces = new LinkedList<>();
this.produces.addAll(produces);
}
return this;
@@ -562,10 +562,10 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addPath(String path, String methodName, Operation operation) {
if (paths == null)
- paths = new TreeMap<String,Map<String,Operation>>();
+ paths = new TreeMap<>();
Map<String,Operation> p = paths.get(path);
if (p == null) {
- p = new TreeMap<String,Operation>(new MethodSorter());
+ p = new TreeMap<>(new MethodSorter());
paths.put(path, p);
}
p.put(methodName, operation);
@@ -623,7 +623,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addDefinition(String name, SchemaInfo schema) {
if (definitions == null)
- definitions = new TreeMap<String,SchemaInfo>();
+ definitions = new TreeMap<>();
definitions.put(name, schema);
return this;
}
@@ -686,7 +686,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addParameter(String name, ParameterInfo parameter) {
if (parameters == null)
- parameters = new TreeMap<String,ParameterInfo>();
+ parameters = new TreeMap<>();
parameters.put(name, parameter);
return this;
}
@@ -749,7 +749,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addResponse(String name, ResponseInfo response) {
if (responses == null)
- responses = new TreeMap<String,ResponseInfo>();
+ responses = new TreeMap<>();
responses.put(name, response);
return this;
}
@@ -805,7 +805,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addSecurityDefinition(String name, SecurityScheme securityScheme) {
if (securityDefinitions == null)
- securityDefinitions = new TreeMap<String,SecurityScheme>();
+ securityDefinitions = new TreeMap<>();
securityDefinitions.put(name, securityScheme);
return this;
}
@@ -873,7 +873,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addSecurity(Map<String,List<String>> security) {
if (this.security == null)
- this.security = new LinkedList<Map<String,List<String>>>();
+ this.security = new LinkedList<>();
this.security.add(security);
return this;
}
@@ -887,7 +887,7 @@ public class Swagger extends SwaggerElement {
* @return This object (for method chaining).
*/
public Swagger security(String scheme, String...alternatives) {
- Map<String,List<String>> m = new LinkedHashMap<String,List<String>>();
+ Map<String,List<String>> m = new LinkedHashMap<>();
m.put(scheme, Arrays.asList(alternatives));
return addSecurity(m);
}
@@ -950,7 +950,7 @@ public class Swagger extends SwaggerElement {
*/
public Swagger addTags(Tag...tags) {
if (this.tags == null)
- this.tags = new LinkedList<Tag>();
+ this.tags = new LinkedList<>();
this.tags.addAll(Arrays.asList(tags));
return this;
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.core.prefs
index 8bd7d89..fb1af7a 100644
--- a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,10 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
@@ -7,9 +13,105 @@ org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.ui.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.ui.prefs b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.ui.prefs
index 9966070..2fb9b4a 100644
--- a/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.ui.prefs
+++ b/juneau-core/juneau-marshall-rdf/.settings/org.eclipse.jdt.ui.prefs
@@ -60,3 +60,9 @@ cleanup_settings_version=2
eclipse.preferences.version=1
formatter_profile=_juneau-formatter-rules
formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=1
+org.eclipse.jdt.ui.staticondemandthreshold=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Bean property getter\: <property>${bare_field_name}</property>.\n *\n * @return The value of the <property>${bare_field_name}</property> property on this bean, or <jk>null</jk> if it is not set.\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * Bean property setter\: <property>${bare_field_name}</property>.\n *\n * @param ${param} The new value for the <property>${bare_field_name}</property> property on
this bean.\n * @return This object (for method chaining).\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// ***************************************************************************************************************************\n// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *\n// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *\n// * to you under the Apache License, V
ersion 2.0 (the "License"); you may not use this file except in compliance *\n// * with the License. You may obtain a copy of the License at * \n// * *\n// * http\://www.apache.org/licenses/LICENSE-2.0 *\n// * *\n// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *\n// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *\n// * specific language governing permissions and limitations under the License. *\n// *******
********************************************************************************************************************</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overr
iding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * TODO\n * \n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" descripti
on\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in c
reated method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="false" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">this.${field} \= ${param};</template></templates>
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java
index 60e66d7..02165cb 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserContext.java
@@ -29,7 +29,7 @@ public final class RdfParserContext extends ParserContext implements RdfCommon {
final String rdfLanguage;
final Namespace juneauNs, juneauBpNs;
final RdfCollectionFormat collectionFormat;
- final Map<String,Object> jenaSettings = new HashMap<String,Object>();
+ final Map<String,Object> jenaSettings = new HashMap<>();
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
index 05dd2a5..2ef01ab 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfParserSession.java
@@ -43,7 +43,7 @@ public class RdfParserSession extends ReaderParserSession {
private final Model model;
private final boolean trimWhitespace, looseCollections;
private final RDFReader rdfReader;
- private final Set<Resource> urisVisited = new HashSet<Resource>();
+ private final Set<Resource> urisVisited = new HashSet<>();
private final RdfCollectionFormat collectionFormat;
/**
@@ -162,7 +162,7 @@ public class RdfParserSession extends ReaderParserSession {
* or by resorting to scanning the model for all nodes with no incoming predicates.
*/
private List<Resource> getRoots(Model m) {
- List<Resource> l = new LinkedList<Resource>();
+ List<Resource> l = new LinkedList<>();
// First try to find the root using the "http://www.apache.org/juneau/root" property.
Property root = m.createProperty(juneauNs.getUri(), RDF_juneauNs_ROOT);
@@ -175,7 +175,7 @@ public class RdfParserSession extends ReaderParserSession {
// Otherwise, we need to find all resources that aren't objects.
// We want to explicitly ignore statements where the subject
// and object are the same node.
- Set<RDFNode> objects = new HashSet<RDFNode>();
+ Set<RDFNode> objects = new HashSet<>();
for (StmtIterator i = m.listStatements(); i.hasNext();) {
Statement st = i.next();
RDFNode subject = st.getSubject();
@@ -232,7 +232,7 @@ public class RdfParserSession extends ReaderParserSession {
private <T> T parseAnything(ClassMeta<?> eType, RDFNode n, Object outer, BeanPropertyMeta pMeta) throws Exception {
if (eType == null)
- eType = (ClassMeta<T>)object();
+ eType = object();
PojoSwap<T,Object> swap = (PojoSwap<T,Object>)eType.getPojoSwap(this);
ClassMeta<?> sType = swap == null ? eType : swap.getSwapClassMeta(this);
setCurrentClass(sType);
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java
index 3360fe0..cd83117 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerContext.java
@@ -36,7 +36,7 @@ public final class RdfSerializerContext extends SerializerContext implements Rdf
final Namespace juneauNs;
final Namespace juneauBpNs;
final RdfCollectionFormat collectionFormat;
- final Map<String,Object> jenaSettings = new HashMap<String,Object>();
+ final Map<String,Object> jenaSettings = new HashMap<>();
final Namespace[] namespaces;
/**
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
index 8c4faa6..a7e02b7 100644
--- a/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
+++ b/juneau-core/juneau-marshall-rdf/src/main/java/org/apache/juneau/jena/RdfSerializerSession.java
@@ -326,7 +326,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
ClassMeta<?> keyType = type.getKeyType(), valueType = type.getValueType();
- ArrayList<Map.Entry<Object,Object>> l = new ArrayList<Map.Entry<Object,Object>>(m.entrySet());
+ ArrayList<Map.Entry<Object,Object>> l = new ArrayList<>(m.entrySet());
Collections.reverse(l);
for (Map.Entry<Object,Object> me : l) {
Object value = me.getValue();
@@ -389,7 +389,7 @@ public final class RdfSerializerSession extends WriterSerializerSession {
private RDFList serializeToList(Collection c, ClassMeta<?> type) throws Exception {
ClassMeta<?> elementType = type.getElementType();
- List<RDFNode> l = new ArrayList<RDFNode>(c.size());
+ List<RDFNode> l = new ArrayList<>(c.size());
for (Object e : c) {
l.add(serializeAnything(e, false, elementType, null, null, null));
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
index 8bd7d89..fb1af7a 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,10 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
@@ -7,9 +13,105 @@ org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=warning
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=protected
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=warning
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.ui.prefs
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.ui.prefs b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.ui.prefs
index 9966070..2fb9b4a 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.ui.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.ui.prefs
@@ -60,3 +60,9 @@ cleanup_settings_version=2
eclipse.preferences.version=1
formatter_profile=_juneau-formatter-rules
formatter_settings_version=12
+org.eclipse.jdt.ui.ignorelowercasenames=true
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.ondemandthreshold=1
+org.eclipse.jdt.ui.staticondemandthreshold=1
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="false" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * Bean property getter\: <property>${bare_field_name}</property>.\n *\n * @return The value of the <property>${bare_field_name}</property> property on this bean, or <jk>null</jk> if it is not set.\n */</template><template autoinsert\="false" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * Bean property setter\: <property>${bare_field_name}</property>.\n *\n * @param ${param} The new value for the <property>${bare_field_name}</property> property on
this bean.\n * @return This object (for method chaining).\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// ***************************************************************************************************************************\n// * Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *\n// * distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *\n// * to you under the Apache License, V
ersion 2.0 (the "License"); you may not use this file except in compliance *\n// * with the License. You may obtain a copy of the License at * \n// * *\n// * http\://www.apache.org/licenses/LICENSE-2.0 *\n// * *\n// * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *\n// * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *\n// * specific language governing permissions and limitations under the License. *\n// *******
********************************************************************************************************************</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="false" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * TODO\n * \n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overr
iding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"/><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * TODO\n * \n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" descripti
on\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in c
reated method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="false" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">this.${field} \= ${param};</template></templates>
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/TODO.txt
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/TODO.txt b/juneau-core/juneau-marshall/TODO.txt
new file mode 100644
index 0000000..74520e5
--- /dev/null
+++ b/juneau-core/juneau-marshall/TODO.txt
@@ -0,0 +1,14 @@
+***************************************************************************************************************************
+* Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file *
+* distributed with this work for additional information regarding copyright ownership. The ASF licenses this file *
+* to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance *
+* with the License. You may obtain a copy of the License at *
+* *
+* http://www.apache.org/licenses/LICENSE-2.0 *
+* *
+* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an *
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the *
+* specific language governing permissions and limitations under the License. *
+***************************************************************************************************************************
+
+Create tests that ensure serializers don't close output but parsers do close input.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 8da93b2..d7aaf79 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -926,7 +926,7 @@ public class BeanContext extends Context {
// then we reuse the same Class->ClassMeta cache map.
// This significantly reduces the number of times we need to construct ClassMeta objects which can be expensive.
private static final ConcurrentHashMap<Integer,Map<Class,ClassMeta>> cmCacheCache
- = new ConcurrentHashMap<Integer,Map<Class,ClassMeta>>();
+ = new ConcurrentHashMap<>();
/** Default config. All default settings. */
public static final BeanContext DEFAULT = PropertyStore.create().getContext(BeanContext.class);
@@ -1020,8 +1020,8 @@ public class BeanContext extends Context {
notBeanClasses = pm.get(BEAN_notBeanClasses, Class[].class, new Class[0]);
- List<String> l1 = new LinkedList<String>();
- List<String> l2 = new LinkedList<String>();
+ List<String> l1 = new LinkedList<>();
+ List<String> l2 = new LinkedList<>();
for (String s : pm.get(BEAN_notBeanPackages, String[].class, new String[0])) {
if (s.endsWith(".*"))
l2.add(s.substring(0, s.length()-2));
@@ -1031,7 +1031,7 @@ public class BeanContext extends Context {
notBeanPackageNames = l1.toArray(new String[l1.size()]);
notBeanPackagePrefixes = l2.toArray(new String[l2.size()]);
- LinkedList<BeanFilter> lbf = new LinkedList<BeanFilter>();
+ LinkedList<BeanFilter> lbf = new LinkedList<>();
for (Class<?> c : pm.get(BEAN_beanFilters, Class[].class, new Class[0])) {
if (isParentClass(BeanFilter.class, c))
lbf.add(newInstance(BeanFilter.class, c));
@@ -1042,7 +1042,7 @@ public class BeanContext extends Context {
}
beanFilters = lbf.toArray(new BeanFilter[0]);
- LinkedList<PojoSwap<?,?>> lpf = new LinkedList<PojoSwap<?,?>>();
+ LinkedList<PojoSwap<?,?>> lpf = new LinkedList<>();
for (Class<?> c : pm.get(BEAN_pojoSwaps, Class[].class, new Class[0])) {
if (isParentClass(PojoSwap.class, c))
lpf.add(newInstance(PojoSwap.class, c));
@@ -1053,7 +1053,7 @@ public class BeanContext extends Context {
}
pojoSwaps = lpf.toArray(new PojoSwap[0]);
- implClasses = new TreeMap<Class<?>,Class<?>>(new ClassComparator());
+ implClasses = new TreeMap<>(new ClassComparator());
Map<Class,Class> m = pm.getMap(BEAN_implClasses, Class.class, Class.class, null);
if (m != null)
for (Map.Entry<Class,Class> e : m.entrySet())
@@ -1071,7 +1071,7 @@ public class BeanContext extends Context {
mediaType = pm.get(BEAN_mediaType, MediaType.class, null);
if (! cmCacheCache.containsKey(hashCode)) {
- ConcurrentHashMap<Class,ClassMeta> cm = new ConcurrentHashMap<Class,ClassMeta>();
+ ConcurrentHashMap<Class,ClassMeta> cm = new ConcurrentHashMap<>();
cm.putIfAbsent(String.class, new ClassMeta(String.class, this, null, null, findPojoSwaps(String.class), findChildPojoSwaps(String.class)));
cm.putIfAbsent(Object.class, new ClassMeta(Object.class, this, null, null, findPojoSwaps(Object.class), findChildPojoSwaps(Object.class)));
cmCacheCache.putIfAbsent(hashCode, cm);
@@ -1231,7 +1231,7 @@ public class BeanContext extends Context {
// Make sure someone didn't already set it while this thread was blocked.
cm = cmCache.get(type);
if (cm == null)
- cm = new ClassMeta<T>(type, this, findImplClass(type), findBeanFilter(type), findPojoSwaps(type), findChildPojoSwaps(type));
+ cm = new ClassMeta<>(type, this, findImplClass(type), findBeanFilter(type), findPojoSwaps(type), findChildPojoSwaps(type));
}
}
if (waitForInit)
@@ -1441,7 +1441,7 @@ public class BeanContext extends Context {
if (o instanceof ParameterizedType) {
ParameterizedType pt = (ParameterizedType)o;
if (! pt.getRawType().equals(Enum.class)) {
- List<ClassMeta<?>> l = new LinkedList<ClassMeta<?>>();
+ List<ClassMeta<?>> l = new LinkedList<>();
for (Type pt2 : pt.getActualTypeArguments()) {
if (pt2 instanceof WildcardType || pt2 instanceof TypeVariable)
return null;
@@ -1498,7 +1498,7 @@ public class BeanContext extends Context {
ClassMeta<?> valueType = resolveType(pParams[1], cm2.getValueType(), cm.getValueType());
if (keyType.isObject() && valueType.isObject())
return cm2;
- return new ClassMeta<T>(cm2, keyType, valueType, null);
+ return new ClassMeta<>(cm2, keyType, valueType, null);
}
if (cm2.isCollection()) {
@@ -1508,7 +1508,7 @@ public class BeanContext extends Context {
ClassMeta<?> elementType = resolveType(pParams[0], cm2.getElementType(), cm.getElementType());
if (elementType.isObject())
return cm2;
- return new ClassMeta<T>(cm2, null, null, elementType);
+ return new ClassMeta<>(cm2, null, null, elementType);
}
return cm2;
@@ -1539,7 +1539,7 @@ public class BeanContext extends Context {
private final <T> PojoSwap[] findPojoSwaps(Class<T> c) {
// Note: On first
if (c != null) {
- List<PojoSwap> l = new ArrayList<PojoSwap>();
+ List<PojoSwap> l = new ArrayList<>();
for (PojoSwap f : pojoSwaps)
if (isParentClass(f.getNormalClass(), c))
l.add(f);
@@ -1561,7 +1561,7 @@ public class BeanContext extends Context {
for (PojoSwap f : pojoSwaps) {
if (isParentClass(c, f.getNormalClass())) {
if (l == null)
- l = new ArrayList<PojoSwap>();
+ l = new ArrayList<>();
l.add(f);
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
index e8a95cb..14e04d8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMap.java
@@ -87,7 +87,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
this.bean = bean;
this.meta = meta;
if (meta.constructorArgs.length > 0)
- propertyCache = new TreeMap<String,Object>();
+ propertyCache = new TreeMap<>();
this.beanTypePropertyName = session.getBeanTypePropertyName(meta.classMeta);
}
@@ -376,7 +376,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
public Set<String> keySet() {
if (meta.dynaProperty == null)
return meta.properties.keySet();
- Set<String> l = new LinkedHashSet<String>();
+ Set<String> l = new LinkedHashSet<>();
for (String p : meta.properties.keySet())
if (! "*".equals(p))
l.add(p);
@@ -447,7 +447,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
public List<BeanPropertyValue> getValues(final boolean ignoreNulls, BeanPropertyValue...prependVals) {
Collection<BeanPropertyMeta> properties = getProperties();
int capacity = (ignoreNulls && properties.size() > 10) ? 10 : properties.size() + prependVals.length;
- List<BeanPropertyValue> l = new ArrayList<BeanPropertyValue>(capacity);
+ List<BeanPropertyValue> l = new ArrayList<>(capacity);
for (BeanPropertyValue v : prependVals)
if (v != null)
l.add(v);
@@ -507,7 +507,7 @@ public class BeanMap<T> extends AbstractMap<String,Object> implements Delegate<T
// If this bean has a dyna-property, then we need to construct the entire set before returning.
// Otherwise, we can create an iterator without a new data structure.
if (meta.dynaProperty != null) {
- Set<Entry<String,Object>> s = new LinkedHashSet<Entry<String,Object>>();
+ Set<Entry<String,Object>> s = new LinkedHashSet<>();
for (BeanPropertyMeta pMeta : getProperties()) {
if (pMeta.isDyna()) {
try {
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
index fc50475..3f116eb 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanMeta.java
@@ -113,7 +113,7 @@ public class BeanMeta<T> {
this.ctx = ctx;
this.c = classMeta.getInnerClass();
- Builder<T> b = new Builder<T>(classMeta, ctx, beanFilter, pNames);
+ Builder<T> b = new Builder<>(classMeta, ctx, beanFilter, pNames);
this.notABeanReason = b.init(this);
this.beanFilter = beanFilter;
@@ -138,8 +138,8 @@ public class BeanMeta<T> {
BeanFilter beanFilter;
String[] pNames;
Map<String,BeanPropertyMeta> properties;
- Map<Method,String> getterProps = new HashMap<Method,String>();
- Map<Method,String> setterProps = new HashMap<Method,String>();
+ Map<Method,String> getterProps = new HashMap<>();
+ Map<Method,String> setterProps = new HashMap<>();
BeanPropertyMeta dynaProperty;
Map<Class<?>,Class<?>[]> typeVarImpls;
@@ -151,7 +151,7 @@ public class BeanMeta<T> {
String dictionaryName, typePropertyName;
boolean sortProperties;
- private Builder(ClassMeta<T> classMeta, BeanContext ctx, BeanFilter beanFilter, String[] pNames) {
+ Builder(ClassMeta<T> classMeta, BeanContext ctx, BeanFilter beanFilter, String[] pNames) {
this.classMeta = classMeta;
this.ctx = ctx;
this.beanFilter = beanFilter;
@@ -169,7 +169,7 @@ public class BeanMeta<T> {
mVis = ctx.beanMethodVisibility,
fVis = ctx.beanFieldVisibility;
- List<Class<?>> bdClasses = new ArrayList<Class<?>>();
+ List<Class<?>> bdClasses = new ArrayList<>();
if (beanFilter != null && beanFilter.getBeanDictionary() != null)
bdClasses.addAll(Arrays.asList(beanFilter.getBeanDictionary()));
Bean bean = classMeta.innerClass.getAnnotation(Bean.class);
@@ -193,7 +193,7 @@ public class BeanMeta<T> {
if (stopClass == null)
stopClass = Object.class;
- Map<String,BeanPropertyMeta.Builder> normalProps = new LinkedHashMap<String,BeanPropertyMeta.Builder>();
+ Map<String,BeanPropertyMeta.Builder> normalProps = new LinkedHashMap<>();
/// See if this class matches one the patterns in the exclude-class list.
if (ctx.isNotABean(c))
@@ -237,7 +237,7 @@ public class BeanMeta<T> {
throw new BeanRuntimeException(c, "Could not set accessibility to true on no-arg constructor");
// Explicitly defined property names in @Bean annotation.
- Set<String> fixedBeanProps = new LinkedHashSet<String>();
+ Set<String> fixedBeanProps = new LinkedHashSet<>();
String[] includeProperties = ctx.getIncludeProperties(c);
String[] excludeProperties = ctx.getExcludeProperties(c);
@@ -312,7 +312,7 @@ public class BeanMeta<T> {
}
}
- typeVarImpls = new HashMap<Class<?>,Class<?>[]>();
+ typeVarImpls = new HashMap<>();
findTypeVarImpls(c, typeVarImpls);
if (typeVarImpls.isEmpty())
typeVarImpls = null;
@@ -383,7 +383,7 @@ public class BeanMeta<T> {
// Only include specified properties if BeanFilter.includeKeys is specified.
// Note that the order must match includeKeys.
} else if (includeKeys != null) {
- Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();
+ Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<>();
for (String k : includeKeys) {
if (properties.containsKey(k))
properties2.put(k, properties.get(k));
@@ -397,7 +397,7 @@ public class BeanMeta<T> {
properties.remove(ep);
if (pNames != null) {
- Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<String,BeanPropertyMeta>();
+ Map<String,BeanPropertyMeta> properties2 = new LinkedHashMap<>();
for (String k : pNames) {
if (properties.containsKey(k))
properties2.put(k, properties.get(k));
@@ -554,7 +554,7 @@ public class BeanMeta<T> {
* @param pn Use this property namer to determine property names from the method names.
*/
private static List<BeanMethod> findBeanMethods(Class<?> c, Class<?> stopClass, Visibility v, Set<String> fixedBeanProps, PropertyNamer pn) {
- List<BeanMethod> l = new LinkedList<BeanMethod>();
+ List<BeanMethod> l = new LinkedList<>();
for (Class<?> c2 : findClasses(c, stopClass)) {
for (Method m : c2.getDeclaredMethods()) {
@@ -619,7 +619,7 @@ public class BeanMeta<T> {
}
private static Collection<Field> findBeanFields(Class<?> c, Class<?> stopClass, Visibility v) {
- List<Field> l = new LinkedList<Field>();
+ List<Field> l = new LinkedList<>();
for (Class<?> c2 : findClasses(c, stopClass)) {
for (Field f : c2.getDeclaredFields()) {
int m = f.getModifiers();
@@ -636,7 +636,7 @@ public class BeanMeta<T> {
}
private static List<Class<?>> findClasses(Class<?> c, Class<?> stopClass) {
- LinkedList<Class<?>> l = new LinkedList<Class<?>>();
+ LinkedList<Class<?>> l = new LinkedList<>();
findClasses(c, l, stopClass);
return l;
}
@@ -668,7 +668,7 @@ public class BeanMeta<T> {
public Collection<BeanPropertyMeta> getPropertyMetas(final String...pNames) {
if (pNames == null)
return getPropertyMetas();
- List<BeanPropertyMeta> l = new ArrayList<BeanPropertyMeta>(pNames.length);
+ List<BeanPropertyMeta> l = new ArrayList<>(pNames.length);
for (int i = 0; i < pNames.length; i++)
l.add(getPropertyMeta(pNames[i]));
return l;
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
index fe2a88b..d198506 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanPropertyMeta.java
@@ -116,7 +116,7 @@ public class BeanPropertyMeta {
boolean validate(BeanContext f, BeanRegistry parentBeanRegistry, Map<Class<?>,Class<?>[]> typeVarImpls) throws Exception {
- List<Class<?>> bdClasses = new ArrayList<Class<?>>();
+ List<Class<?>> bdClasses = new ArrayList<>();
if (field == null && getter == null)
return false;
@@ -841,7 +841,7 @@ public class BeanPropertyMeta {
} else /* isArray() */ {
if (m.arrayPropertyCache == null)
- m.arrayPropertyCache = new TreeMap<String,List<?>>();
+ m.arrayPropertyCache = new TreeMap<>();
List l = m.arrayPropertyCache.get(name);
if (l == null) {
@@ -952,7 +952,7 @@ public class BeanPropertyMeta {
* @return A list of annotations ordered in child-to-parent order. Never <jk>null</jk>.
*/
public <A extends Annotation> List<A> findAnnotations(Class<A> a) {
- List<A> l = new LinkedList<A>();
+ List<A> l = new LinkedList<>();
if (field != null) {
addIfNotNull(l, field.getAnnotation(a));
appendAnnotations(a, field.getType(), l);
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
index 27ac252..4379118 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanProxyInvocationHandler.java
@@ -38,7 +38,7 @@ public class BeanProxyInvocationHandler<T> implements InvocationHandler {
*/
public BeanProxyInvocationHandler(BeanMeta<T> meta) {
this.meta = meta;
- this.beanProps = new HashMap<String, Object>();
+ this.beanProps = new HashMap<>();
}
/**
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
index fb11738..819b536 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanRegistry.java
@@ -48,8 +48,8 @@ public class BeanRegistry {
BeanRegistry(BeanContext beanContext, BeanRegistry parent, Class<?>...classes) {
this.beanContext = beanContext;
- this.map = new ConcurrentHashMap<String,ClassMeta<?>>();
- this.reverseMap = new ConcurrentHashMap<Class<?>,String>();
+ this.map = new ConcurrentHashMap<>();
+ this.reverseMap = new ConcurrentHashMap<>();
for (Class<?> c : beanContext.beanDictionaryClasses)
addClass(c);
if (parent != null)
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
index 4382b38..eabbdee 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanSession.java
@@ -42,7 +42,7 @@ public class BeanSession extends Session {
private final TimeZone timeZone;
private final MediaType mediaType;
private final boolean debug;
- private Stack<StringBuilder> sbStack = new Stack<StringBuilder>();
+ private Stack<StringBuilder> sbStack = new Stack<>();
/**
* Create a new session using properties specified in the context.
@@ -777,7 +777,7 @@ public class BeanSession extends Session {
BeanMeta m = cm.getBeanMeta();
if (m == null)
throw new BeanRuntimeException(c, "Class is not a bean. Reason=''{0}''", cm.getNotABeanReason());
- return new BeanMap<T>(this, o, m);
+ return new BeanMap<>(this, o, m);
}
/**
@@ -820,7 +820,7 @@ public class BeanSession extends Session {
T bean = null;
if (m.constructorArgs.length == 0)
bean = newBean(outer, c);
- return new BeanMap<T>(this, bean, m);
+ return new BeanMap<>(this, bean, m);
}
/**
@@ -1091,12 +1091,8 @@ public class BeanSession extends Session {
}
@Override /* Session */
- public boolean close() throws BeanRuntimeException {
- if (super.close()) {
- if (debug && hasWarnings())
- throw new BeanRuntimeException("Warnings occurred in session: \n" + join(getWarnings(), "\n"));
- return true;
- }
- return false;
+ public void checkForWarnings() {
+ if (debug)
+ super.checkForWarnings();
}
}
http://git-wip-us.apache.org/repos/asf/juneau/blob/d1258753/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
----------------------------------------------------------------------
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
index 32336fb..ee5dd7f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/ClassMeta.java
@@ -293,7 +293,7 @@ public final class ClassMeta<T> implements Type {
}
@SuppressWarnings({"unchecked","rawtypes","hiding"})
- private class ClassMetaBuilder<T> {
+ private final class ClassMetaBuilder<T> {
Class<T> innerClass;
Class<? extends T> implClass;
BeanContext beanContext;
@@ -319,8 +319,8 @@ public final class ClassMeta<T> implements Type {
numberConstructorType = null;
Object primitiveDefault = null;
Map<String,Method>
- publicMethods = new LinkedHashMap<String,Method>(),
- remoteableMethods = new LinkedHashMap<String,Method>();
+ publicMethods = new LinkedHashMap<>(),
+ remoteableMethods = new LinkedHashMap<>();
ClassMeta<?>
keyType = null,
valueType = null,
@@ -332,7 +332,7 @@ public final class ClassMeta<T> implements Type {
dictionaryName = null;
Throwable initException = null;
BeanMeta beanMeta = null;
- List<PojoSwap> pojoSwaps = new ArrayList<PojoSwap>();
+ List<PojoSwap> pojoSwaps = new ArrayList<>();
InvocationHandler invocationHandler = null;
BeanRegistry beanRegistry = null;
PojoSwap<?,?>[] childPojoSwaps;
@@ -340,7 +340,7 @@ public final class ClassMeta<T> implements Type {
childSwapMap,
childUnswapMap;
- private ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?>[] pojoSwaps, PojoSwap<?,?>[] childPojoSwaps) {
+ ClassMetaBuilder(Class<T> innerClass, BeanContext beanContext, Class<? extends T> implClass, BeanFilter beanFilter, PojoSwap<T,?>[] pojoSwaps, PojoSwap<?,?>[] childPojoSwaps) {
this.innerClass = innerClass;
this.beanContext = beanContext;