juneau-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamesbog...@apache.org
Subject [juneau] branch master updated: Java 8 prereq.
Date Sat, 10 Nov 2018 18:29:37 GMT
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 b53216c  Java 8 prereq.
b53216c is described below

commit b53216c6951cd78b4f0f4460b095888475f6337f
Author: JamesBognar <jamesbognar@apache.org>
AuthorDate: Sat Nov 10 13:29:23 2018 -0500

    Java 8 prereq.
---
 juneau-core/juneau-config/.classpath               |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-core/juneau-config/pom.xml                  |  4 +-
 juneau-core/juneau-core-test/.classpath            |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           | 14 +++++--
 juneau-core/juneau-core-test/pom.xml               |  4 +-
 juneau-core/juneau-dto/.classpath                  |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-core/juneau-dto/pom.xml                     |  4 +-
 .../org/apache/juneau/dto/swagger/Operation.java   | 20 ++++++---
 .../apache/juneau/dto/swagger/ParameterInfo.java   |  7 ++--
 .../apache/juneau/dto/swagger/ResponseInfo.java    | 14 ++++---
 .../org/apache/juneau/dto/swagger/SchemaInfo.java  |  7 +++-
 .../apache/juneau/dto/swagger/SecurityScheme.java  |  7 ++--
 .../org/apache/juneau/dto/swagger/Swagger.java     | 49 +++++++++++++++-------
 juneau-core/juneau-marshall-rdf/.classpath         |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-core/juneau-marshall-rdf/pom.xml            |  4 +-
 juneau-core/juneau-marshall/.classpath             |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-core/juneau-marshall/pom.xml                |  4 +-
 .../src/main/java/org/apache/juneau/BeanMeta.java  |  5 ++-
 .../src/main/java/org/apache/juneau/ClassMeta.java |  9 +++-
 .../main/java/org/apache/juneau/PropertyStore.java | 18 +++++---
 .../apache/juneau/internal/BeanPropertyUtils.java  |  8 +++-
 .../java/org/apache/juneau/internal/DateUtils.java |  3 +-
 .../jsonschema/JsonSchemaGeneratorSession.java     |  5 ++-
 .../juneau/utils/ClasspathResourceManager.java     |  9 +++-
 juneau-core/juneau-svl/.classpath                  |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-core/juneau-svl/pom.xml                     |  4 +-
 .../org/apache/juneau/svl/VarResolverSession.java  |  5 ++-
 juneau-doc/.classpath                              |  6 +--
 juneau-doc/.settings/org.eclipse.jdt.core.prefs    |  6 +--
 juneau-examples/juneau-examples-core/.classpath    |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 .../juneau-microservice-test/.classpath            |  6 +--
 juneau-rest/juneau-rest-client/.classpath          |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-rest/juneau-rest-client/pom.xml             |  4 +-
 juneau-rest/juneau-rest-server-jaxrs/.classpath    |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-rest/juneau-rest-server-jaxrs/pom.xml       |  4 +-
 juneau-rest/juneau-rest-server/.classpath          |  6 +--
 .../.settings/org.eclipse.jdt.core.prefs           |  6 +--
 juneau-rest/juneau-rest-server/pom.xml             |  4 +-
 .../org/apache/juneau/rest/RequestFormData.java    |  6 ++-
 .../org/apache/juneau/rest/RequestHeaders.java     |  6 ++-
 .../java/org/apache/juneau/rest/RequestQuery.java  |  6 ++-
 .../org/apache/juneau/rest/util/RestUtils.java     |  4 +-
 pom.xml                                            |  4 +-
 54 files changed, 218 insertions(+), 174 deletions(-)

diff --git a/juneau-core/juneau-config/.classpath b/juneau-core/juneau-config/.classpath
index 82763f1..9b30e89 100644
--- a/juneau-core/juneau-config/.classpath
+++ b/juneau-core/juneau-config/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,5 +17,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-core/juneau-config/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-config/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-core/juneau-config/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-config/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-config/pom.xml b/juneau-core/juneau-config/pom.xml
index f9848d2..06a8405 100644
--- a/juneau-core/juneau-config/pom.xml
+++ b/juneau-core/juneau-config/pom.xml
@@ -45,8 +45,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
   	</properties>
 
 	<build>
diff --git a/juneau-core/juneau-core-test/.classpath b/juneau-core/juneau-core-test/.classpath
index 36d8255..03d1dc3 100644
--- a/juneau-core/juneau-core-test/.classpath
+++ b/juneau-core/juneau-core-test/.classpath
@@ -12,15 +12,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs
index 9ef170c..4b04196 100644
--- a/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-core-test/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,16 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+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.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-core-test/pom.xml b/juneau-core/juneau-core-test/pom.xml
index 7296fbe..e7f06f3 100644
--- a/juneau-core/juneau-core-test/pom.xml
+++ b/juneau-core/juneau-core-test/pom.xml
@@ -69,8 +69,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-core/juneau-dto/.classpath b/juneau-core/juneau-dto/.classpath
index 7201cc3..269c122 100644
--- a/juneau-core/juneau-dto/.classpath
+++ b/juneau-core/juneau-dto/.classpath
@@ -11,11 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -27,5 +22,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-core/juneau-dto/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-dto/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-core/juneau-dto/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-dto/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-dto/pom.xml b/juneau-core/juneau-dto/pom.xml
index 365db8d..60aca2a 100644
--- a/juneau-core/juneau-dto/pom.xml
+++ b/juneau-core/juneau-dto/pom.xml
@@ -40,8 +40,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
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 1c674f7..2a6108b 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
@@ -170,13 +170,18 @@ public class Operation extends SwaggerElement {
 		this.consumes = newList(copyFrom.consumes);
 		this.produces = newList(copyFrom.produces);
 
-		this.parameters = copyFrom.parameters == null ? null : new ArrayList<ParameterInfo>();
-		if (copyFrom.parameters != null)
+		if (copyFrom.parameters == null) {
+			this.parameters = null;
+		} else {
+			this.parameters = new ArrayList<>();
 			for (ParameterInfo p : copyFrom.parameters)
 				this.parameters.add(p.copy());
+		}
 
-		this.security = copyFrom.security == null ? null : new ArrayList<Map<String,List<String>>>();
-		if (copyFrom.security != null) {
+		if (copyFrom.security == null) {
+			this.security = null;
+		} else {
+			this.security = new ArrayList<>();
 			for (Map<String,List<String>> m : copyFrom.security) {
 				Map<String,List<String>> m2 = new LinkedHashMap<>();
 				for (Map.Entry<String,List<String>> e : m.entrySet())
@@ -185,10 +190,13 @@ public class Operation extends SwaggerElement {
 			}
 		}
 
-		this.responses = copyFrom.responses == null ? null : new LinkedHashMap<String,ResponseInfo>();
-		if (copyFrom.responses != null)
+		if (copyFrom.responses == null) {
+			this.responses = null;
+		} else {
+			this.responses = new LinkedHashMap<>();
 			for (Map.Entry<String,ResponseInfo> e : copyFrom.responses.entrySet())
 				this.responses.put(e.getKey(), e.getValue().copy());
+		}
 	}
 
 	/**
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 430d695..f1acf12 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
@@ -165,9 +165,10 @@ public class ParameterInfo extends SwaggerElement {
 		this._enum = newList(copyFrom._enum);
 		this.example = copyFrom.example;
 
-		this.examples = copyFrom.examples == null ? null : new LinkedHashMap<String,String>();
-		if (copyFrom.examples != null)
-			this.examples.putAll(copyFrom.examples);
+		if (copyFrom.examples == null)
+			this.examples = null;
+		else
+			this.examples = new LinkedHashMap<>(copyFrom.examples);
 	}
 
 	/**
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 418bdca..1c2b58a 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
@@ -84,16 +84,20 @@ public class ResponseInfo extends SwaggerElement {
 		this.description = copyFrom.description;
 		this.schema = copyFrom.schema == null ? null : copyFrom.schema.copy();
 
-		this.headers = copyFrom.headers == null ? null : new LinkedHashMap<String,HeaderInfo>();
-		if (copyFrom.headers != null)
+		if (copyFrom.headers == null) {
+			this.headers = null;
+		} else {
+			this.headers = new LinkedHashMap<>();
 			for (Map.Entry<String,HeaderInfo> e : copyFrom.headers.entrySet())
 				this.headers.put(e.getKey(),	e.getValue().copy());
+		}
 
 		this.example = copyFrom.example;
 
-		this.examples = copyFrom.examples == null ? null : new LinkedHashMap<String,Object>();
-		if (copyFrom.examples != null)
-			this.examples.putAll(copyFrom.examples);
+		if (copyFrom.examples == null)
+			this.examples = null;
+		else
+			this.examples = new LinkedHashMap<>(copyFrom.examples);
 	}
 
 	/**
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 336f0af..d279f41 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
@@ -140,10 +140,13 @@ public class SchemaInfo extends SwaggerElement {
 		this.allOf = newList(copyFrom.allOf);
 		this.required = newList(copyFrom.required);
 
-		this.properties = copyFrom.properties == null ? null : new LinkedHashMap<String,SchemaInfo>();
-		if (copyFrom.properties != null)
+		if (copyFrom.properties == null) {
+			this.properties = null;
+		} else {
+			this.properties = new LinkedHashMap<>();
 			for (Map.Entry<String,SchemaInfo> e : copyFrom.properties.entrySet())
 				this.properties.put(e.getKey(), e.getValue().copy());
+		}
 
 		this.additionalProperties = copyFrom.additionalProperties == null ? null : copyFrom.additionalProperties.copy();
 	}
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 2e4e68c..7317409 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
@@ -96,9 +96,10 @@ public class SecurityScheme extends SwaggerElement {
 		this.authorizationUrl = copyFrom.authorizationUrl;
 		this.tokenUrl = copyFrom.tokenUrl;
 
-		this.scopes = copyFrom.scopes == null ? null : new LinkedHashMap<String,String>();
-		if (copyFrom.scopes != null)
-			this.scopes.putAll(copyFrom.scopes);
+		if (copyFrom.scopes == null)
+			this.scopes = null;
+		else
+			this.scopes = new LinkedHashMap<>(copyFrom.scopes);
 	}
 
 	/**
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 4ee8b4f..437e4ef 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
@@ -85,49 +85,70 @@ public class Swagger extends SwaggerElement {
 		this.consumes = newList(copyFrom.consumes);
 		this.produces = newList(copyFrom.produces);
 
-		this.tags = copyFrom.tags == null ? null : new ArrayList<Tag>();
-		if (copyFrom.tags != null)
+		if (copyFrom.tags == null) {
+			this.tags = null;
+		} else {
+			this.tags = new ArrayList<>();
 			for (Tag t : copyFrom.tags)
 				this.tags.add(t.copy());
+		}
 
-		this.security = copyFrom.security == null ? null : new ArrayList<Map<String,List<String>>>();
-		if (copyFrom.security != null)
+		if (copyFrom.security == null) {
+			this.security = null;
+		} else {
+			this.security = new ArrayList<>();
 			for (Map<String,List<String>> m : copyFrom.security) {
 				Map<String,List<String>> m2 = new LinkedHashMap<>();
 				for (Map.Entry<String,List<String>> e : m.entrySet())
 					m2.put(e.getKey(), newList(e.getValue()));
 				this.security.add(m2);
 			}
+		}
 
 		// TODO - Definitions are not deep copied, so they should not contain references.
-		this.definitions = copyFrom.definitions == null ? null : new LinkedHashMap<String,ObjectMap>();
-		if (copyFrom.definitions != null)
+		if (copyFrom.definitions == null) {
+			this.definitions = null;
+		} else {
+			this.definitions = new LinkedHashMap<>();
 			for (Map.Entry<String,ObjectMap> e : copyFrom.definitions.entrySet())
 				this.definitions.put(e.getKey(), new ObjectMap(e.getValue()));
+		}
 
-		this.parameters = copyFrom.parameters == null ? null : new LinkedHashMap<String,ParameterInfo>();
-		if (copyFrom.parameters != null)
+		if (copyFrom.parameters == null) {
+			this.parameters = null;
+		} else {
+			this.parameters = new LinkedHashMap<>();
 			for (Map.Entry<String,ParameterInfo> e : copyFrom.parameters.entrySet())
 				this.parameters.put(e.getKey(), e.getValue().copy());
+		}
 
-		this.responses = copyFrom.responses == null ? null : new LinkedHashMap<String,ResponseInfo>();
-		if (copyFrom.responses != null)
+		if (copyFrom.responses == null) {
+			this.responses = null;
+		} else {
+			this.responses = new LinkedHashMap<>();
 			for (Map.Entry<String,ResponseInfo> e : copyFrom.responses.entrySet())
 				this.responses.put(e.getKey(), e.getValue().copy());
+		}
 
-		this.securityDefinitions = copyFrom.securityDefinitions == null ? null : new LinkedHashMap<String,SecurityScheme>();
-		if (copyFrom.securityDefinitions != null)
+		if (copyFrom.securityDefinitions == null) {
+			this.securityDefinitions = null;
+		} else {
+			this.securityDefinitions = new LinkedHashMap<>();
 			for (Map.Entry<String,SecurityScheme> e : copyFrom.securityDefinitions.entrySet())
 				this.securityDefinitions.put(e.getKey(), e.getValue().copy());
+		}
 
-		this.paths = copyFrom.paths == null ? null : new LinkedHashMap<String,OperationMap>();
-		if (copyFrom.paths != null)
+		if (copyFrom.paths == null) {
+			this.paths = null;
+		} else {
+			this.paths = new LinkedHashMap<>();
 			for (Map.Entry<String,OperationMap> e : copyFrom.paths.entrySet()) {
 				OperationMap m = new OperationMap();
 				for (Map.Entry<String,Operation> e2 : e.getValue().entrySet())
 					m.put(e2.getKey(), e2.getValue().copy());
 				this.paths.put(e.getKey(), m);
 			}
+		}
 	}
 
 	/**
diff --git a/juneau-core/juneau-marshall-rdf/.classpath b/juneau-core/juneau-marshall-rdf/.classpath
index 62a715d..269c122 100644
--- a/juneau-core/juneau-marshall-rdf/.classpath
+++ b/juneau-core/juneau-marshall-rdf/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
@@ -27,5 +22,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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 318838c..1a5f6d5 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
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-marshall-rdf/pom.xml b/juneau-core/juneau-marshall-rdf/pom.xml
index 880bae9..49bd897 100644
--- a/juneau-core/juneau-marshall-rdf/pom.xml
+++ b/juneau-core/juneau-marshall-rdf/pom.xml
@@ -49,8 +49,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-core/juneau-marshall/.classpath b/juneau-core/juneau-marshall/.classpath
index 7201cc3..269c122 100644
--- a/juneau-core/juneau-marshall/.classpath
+++ b/juneau-core/juneau-marshall/.classpath
@@ -11,11 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -27,5 +22,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
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 1e4c505..4a82b56 100644
--- a/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-marshall/.settings/org.eclipse.jdt.core.prefs
@@ -10,9 +10,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -122,7 +122,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-marshall/pom.xml b/juneau-core/juneau-marshall/pom.xml
index da802d5..d8890ea 100644
--- a/juneau-core/juneau-marshall/pom.xml
+++ b/juneau-core/juneau-marshall/pom.xml
@@ -32,8 +32,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
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 267cf69..c9900ef 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
@@ -385,7 +385,10 @@ public class BeanMeta<T> {
 
 				sortProperties = (ctx.isSortProperties() || (beanFilter != null && beanFilter.isSortProperties())) && fixedBeanProps.isEmpty();
 
-				properties = sortProperties ? new TreeMap<String,BeanPropertyMeta>() : new LinkedHashMap<String,BeanPropertyMeta>();
+				if (sortProperties)
+					properties = new TreeMap<>();
+				else
+					properties = new LinkedHashMap<>();
 
 				if (beanFilter != null && beanFilter.getTypeName() != null)
 					dictionaryName = beanFilter.getTypeName();
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 6e4fda4..571b9ff 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
@@ -384,8 +384,13 @@ public final class ClassMeta<T> implements Type {
 
 			this.implClass = implClass;
 			this.childPojoSwaps = childPojoSwaps;
-			this.childSwapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();
-			this.childUnswapMap = childPojoSwaps == null ? null : new ConcurrentHashMap<Class<?>,PojoSwap<?,?>>();
+			if (childPojoSwaps == null) {
+				this.childSwapMap = null;
+				this.childUnswapMap = null;
+			} else {
+				this.childSwapMap = new ConcurrentHashMap<>();
+				this.childUnswapMap = new ConcurrentHashMap<>();
+			}
 
 			Class<T> c = innerClass;
 			if (c.isPrimitive()) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
index 2dabe3c..354736a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/PropertyStore.java
@@ -368,9 +368,10 @@ public final class PropertyStore {
 	 * @param key The property name.
 	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public Set<Class<?>> getClassSetProperty(String key) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_SET : p.asSet(Class.class);
+		return p == null ? Collections.EMPTY_SET : (Set)p.asSet(Class.class);
 	}
 
 	/**
@@ -380,9 +381,10 @@ public final class PropertyStore {
 	 * @param eType The class type of the elements in the property.
 	 * @return The property value as an unmodifiable <code>LinkedHashSet</code>, or an empty set if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public <T> Set<Class<T>> getClassSetProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_SET : p.asSet(Class.class);
+		return p == null ? Collections.EMPTY_SET : (Set)p.asSet(Class.class);
 	}
 
 	/**
@@ -416,9 +418,10 @@ public final class PropertyStore {
 	 * @param key The property name.
 	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public List<Class<?>> getClassListProperty(String key) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_LIST : p.asList(Class.class);
+		return p == null ? Collections.EMPTY_LIST : (List)p.asList(Class.class);
 	}
 
 	/**
@@ -428,9 +431,10 @@ public final class PropertyStore {
 	 * @param eType The class type of the elements in the property.
 	 * @return The property value as an unmodifiable <code>ArrayList</code>, or an empty list if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public <T> List<Class<T>> getClassListProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_LIST : p.asList(Class.class);
+		return p == null ? Collections.EMPTY_LIST : (List)p.asList(Class.class);
 	}
 
 	/**
@@ -451,9 +455,10 @@ public final class PropertyStore {
 	 * @param key The property name.
 	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public Map<String,Class<?>> getClassMapProperty(String key) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_MAP : p.asMap(Class.class);
+		return p == null ? Collections.EMPTY_MAP : (Map)p.asMap(Class.class);
 	}
 
 	/**
@@ -463,9 +468,10 @@ public final class PropertyStore {
 	 * @param eType The class type of the elements in the property.
 	 * @return The property value as an unmodifiable <code>LinkedHashMap</code>, or an empty map if it doesn't exist.
 	 */
+	@SuppressWarnings("rawtypes")
 	public <T> Map<String,Class<T>> getClassMapProperty(String key, Class<T> eType) {
 		Property p = findProperty(key);
-		return p == null ? Collections.EMPTY_MAP : p.asMap(Class.class);
+		return p == null ? Collections.EMPTY_MAP : (Map)p.asMap(Class.class);
 	}
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/BeanPropertyUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/BeanPropertyUtils.java
index d4a3376..20afb23 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/BeanPropertyUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/BeanPropertyUtils.java
@@ -90,7 +90,9 @@ public final class BeanPropertyUtils {
 		if (values == null)
 			return appendTo;
 		try {
-			List<T> l = appendTo == null ? new ArrayList<T>() : appendTo;
+			List<T> l = appendTo;
+			if (appendTo == null)
+				l = new ArrayList<>();
 			for (Object o : values) {
 				if (o != null) {
 					if (isObjectList(o, false)) {
@@ -130,7 +132,9 @@ public final class BeanPropertyUtils {
 		if (values == null)
 			return appendTo;
 		try {
-			Map<K,V> m = appendTo == null ? new LinkedHashMap<K,V>() : appendTo;
+			Map<K,V> m = appendTo;
+			if (m == null)
+				m = new LinkedHashMap<>();
 			for (Object o : values) {
 				if (o != null) {
 					if (isObjectMap(o, false)) {
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
index 36a6da8..952853a 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/internal/DateUtils.java
@@ -183,7 +183,8 @@ public final class DateUtils {
 				new ThreadLocal<SoftReference<Map<String,SimpleDateFormat>>>() {
 			@Override
 			protected SoftReference<Map<String,SimpleDateFormat>> initialValue() {
-				return new SoftReference<Map<String,SimpleDateFormat>>(new HashMap<String,SimpleDateFormat>());
+				Map<String,SimpleDateFormat> m = new HashMap<>();
+				return new SoftReference<>(m);
 			}
 		};
 
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
index c11ebad..f5c802f 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/jsonschema/JsonSchemaGeneratorSession.java
@@ -53,7 +53,10 @@ public class JsonSchemaGeneratorSession extends BeanTraverseSession {
 	protected JsonSchemaGeneratorSession(JsonSchemaGenerator ctx, BeanSessionArgs args) {
 		super(ctx, args);
 		this.ctx = ctx;
-		defs = isUseBeanDefs() ? new TreeMap<String,ObjectMap>() : null;
+		if (isUseBeanDefs())
+			defs = new TreeMap<>();
+		else
+			defs = null;
 	}
 
 	/**
diff --git a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
index 9e0180d..ff8fee8 100644
--- a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
+++ b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/utils/ClasspathResourceManager.java
@@ -42,8 +42,13 @@ public final class ClasspathResourceManager {
 		this.baseClass = baseClass;
 		this.resourceFinder = resourceFinder;
 		this.useCache = useCache;
-		this.byteCache = useCache ? new ConcurrentHashMap<ResourceKey,byte[]>() : null;
-		this.stringCache = useCache ? new ConcurrentHashMap<ResourceKey,String>() : null;
+		if (useCache) {
+			this.byteCache = new ConcurrentHashMap<>();
+			this.stringCache = new ConcurrentHashMap<>();
+		} else {
+			this.byteCache = null;
+			this.stringCache = null;
+		}
 	}
 
 	/**
diff --git a/juneau-core/juneau-svl/.classpath b/juneau-core/juneau-svl/.classpath
index 82763f1..9b30e89 100644
--- a/juneau-core/juneau-svl/.classpath
+++ b/juneau-core/juneau-svl/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,5 +17,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-core/juneau-svl/.settings/org.eclipse.jdt.core.prefs b/juneau-core/juneau-svl/.settings/org.eclipse.jdt.core.prefs
index 218cf9d..72d13e9 100644
--- a/juneau-core/juneau-svl/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-core/juneau-svl/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-core/juneau-svl/pom.xml b/juneau-core/juneau-svl/pom.xml
index 2e32c54..646ef03 100644
--- a/juneau-core/juneau-svl/pom.xml
+++ b/juneau-core/juneau-svl/pom.xml
@@ -40,8 +40,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverSession.java b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverSession.java
index e890836..0a78849 100644
--- a/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverSession.java
+++ b/juneau-core/juneau-svl/src/main/java/org/apache/juneau/svl/VarResolverSession.java
@@ -57,7 +57,10 @@ public class VarResolverSession {
 	 */
 	public VarResolverSession(VarResolverContext context, Map<String,Object> sessionObjects) {
 		this.context = context;
-		this.sessionObjects = sessionObjects != null ? sessionObjects : new HashMap<String,Object>();
+		if (sessionObjects != null)
+			this.sessionObjects = sessionObjects;
+		else
+			this.sessionObjects = new HashMap<>();
 	}
 
 	/**
diff --git a/juneau-doc/.classpath b/juneau-doc/.classpath
index 04ba4a4..911e2a1 100644
--- a/juneau-doc/.classpath
+++ b/juneau-doc/.classpath
@@ -12,11 +12,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -28,5 +23,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-doc/.settings/org.eclipse.jdt.core.prefs b/juneau-doc/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-doc/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-doc/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-examples/juneau-examples-core/.classpath b/juneau-examples/juneau-examples-core/.classpath
index 2d0b527..7e41bff 100644
--- a/juneau-examples/juneau-examples-core/.classpath
+++ b/juneau-examples/juneau-examples-core/.classpath
@@ -18,15 +18,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-examples/juneau-examples-core/.settings/org.eclipse.jdt.core.prefs b/juneau-examples/juneau-examples-core/.settings/org.eclipse.jdt.core.prefs
index 64249f3..0721a8a 100644
--- a/juneau-examples/juneau-examples-core/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-examples/juneau-examples-core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-examples/juneau-examples-rest/.settings/org.eclipse.jdt.core.prefs b/juneau-examples/juneau-examples-rest/.settings/org.eclipse.jdt.core.prefs
index 64249f3..0721a8a 100644
--- a/juneau-examples/juneau-examples-rest/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-examples/juneau-examples-rest/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.jdt.core.prefs b/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-microservice/juneau-microservice-server/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-microservice/juneau-microservice-template/.settings/org.eclipse.jdt.core.prefs b/juneau-microservice/juneau-microservice-template/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-microservice/juneau-microservice-template/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-microservice/juneau-microservice-template/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-microservice/juneau-microservice-test/.classpath b/juneau-microservice/juneau-microservice-test/.classpath
index 644b8f9..02c73ea 100644
--- a/juneau-microservice/juneau-microservice-test/.classpath
+++ b/juneau-microservice/juneau-microservice-test/.classpath
@@ -17,15 +17,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-rest/juneau-rest-client/.classpath b/juneau-rest/juneau-rest-client/.classpath
index 36d8255..03d1dc3 100644
--- a/juneau-rest/juneau-rest-client/.classpath
+++ b/juneau-rest/juneau-rest-client/.classpath
@@ -12,15 +12,11 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-rest/juneau-rest-client/.settings/org.eclipse.jdt.core.prefs b/juneau-rest/juneau-rest-client/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-rest/juneau-rest-client/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-rest/juneau-rest-client/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-rest/juneau-rest-client/pom.xml b/juneau-rest/juneau-rest-client/pom.xml
index bd0d5aa..135f82b 100644
--- a/juneau-rest/juneau-rest-client/pom.xml
+++ b/juneau-rest/juneau-rest-client/pom.xml
@@ -74,8 +74,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/.classpath b/juneau-rest/juneau-rest-server-jaxrs/.classpath
index 82763f1..9b30e89 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/.classpath
+++ b/juneau-rest/juneau-rest-server-jaxrs/.classpath
@@ -6,11 +6,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -22,5 +17,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.jdt.core.prefs b/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-rest/juneau-rest-server-jaxrs/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-rest/juneau-rest-server-jaxrs/pom.xml b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
index 38b7db8..c40a1df 100644
--- a/juneau-rest/juneau-rest-server-jaxrs/pom.xml
+++ b/juneau-rest/juneau-rest-server-jaxrs/pom.xml
@@ -59,8 +59,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-rest/juneau-rest-server/.classpath b/juneau-rest/juneau-rest-server/.classpath
index 58364e7..c74f311 100644
--- a/juneau-rest/juneau-rest-server/.classpath
+++ b/juneau-rest/juneau-rest-server/.classpath
@@ -22,16 +22,12 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/juneau-rest/juneau-rest-server/.settings/org.eclipse.jdt.core.prefs b/juneau-rest/juneau-rest-server/.settings/org.eclipse.jdt.core.prefs
index 318838c..1a5f6d5 100644
--- a/juneau-rest/juneau-rest-server/.settings/org.eclipse.jdt.core.prefs
+++ b/juneau-rest/juneau-rest-server/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
 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
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -112,7 +112,7 @@ 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.compiler.source=1.8
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
diff --git a/juneau-rest/juneau-rest-server/pom.xml b/juneau-rest/juneau-rest-server/pom.xml
index 2e52665..00247fa 100644
--- a/juneau-rest/juneau-rest-server/pom.xml
+++ b/juneau-rest/juneau-rest-server/pom.xml
@@ -67,8 +67,8 @@
 		<!-- Skip javadoc generation since we generate them in the aggregate pom -->
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		
-		<maven.compiler.source>1.6</maven.compiler.source>
-		<maven.compiler.target>1.6</maven.compiler.target>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<build>
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
index 2e78c7b..fa66f1c 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestFormData.java
@@ -595,7 +595,11 @@ public class RequestFormData extends LinkedHashMap<String,String[]> {
 	 * @return A JSON string containing the contents of the form-data parameters.
 	 */
 	public String toString(boolean sorted) {
-		Map<String,Object> m = (sorted ? new TreeMap<String,Object>() : new LinkedHashMap<String,Object>());
+		Map<String,Object> m = null;
+		if (sorted)
+			m = new TreeMap<>();
+		else
+			m = new LinkedHashMap<>();
 		for (Map.Entry<String,String[]> e : this.entrySet()) {
 			String[] v = e.getValue();
 			if (v != null)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
index 65fe729..3f1ab0e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestHeaders.java
@@ -947,7 +947,11 @@ public class RequestHeaders extends TreeMap<String,String[]> {
 	 * @return A JSON string containing the contents of the headers.
 	 */
 	public String toString(boolean sorted) {
-		Map<String,Object> m = (sorted ? new TreeMap<String,Object>() : new LinkedHashMap<String,Object>());
+		Map<String,Object> m = null;
+		if (sorted)
+			m = new TreeMap<>();
+		else
+			m = new LinkedHashMap<>();
 		for (Map.Entry<String,String[]> e : this.entrySet()) {
 			String[] v = e.getValue();
 			m.put(e.getKey(), v.length == 1 ? v[0] : v);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
index c28f540..3397bb6 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/RequestQuery.java
@@ -657,7 +657,11 @@ public final class RequestQuery extends LinkedHashMap<String,String[]> {
 	 * @return A JSON string containing the contents of the query parameters.
 	 */
 	public String toString(boolean sorted) {
-		Map<String,Object> m = (sorted ? new TreeMap<String,Object>() : new LinkedHashMap<String,Object>());
+		Map<String,Object> m = null;
+		if (sorted)
+			m = new TreeMap<>();
+		else
+			m = new LinkedHashMap<>();
 		for (Map.Entry<String,String[]> e : this.entrySet()) {
 			String[] v = e.getValue();
 			m.put(e.getKey(), v.length == 1 ? v[0] : v);
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
index 0bc58dc..fde2eff 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/RestUtils.java
@@ -281,7 +281,9 @@ public final class RestUtils {
 	 */
 	public static Map<String,String[]> parseQuery(Object qs, Map<String,String[]> map) throws Exception {
 
-		Map<String,String[]> m = map == null ? new TreeMap<String,String[]>() : map;
+		Map<String,String[]> m = map;
+		if (m == null)
+			m = new TreeMap<>();
 
 		if (qs == null || ((qs instanceof CharSequence) && isEmpty(qs)))
 			return m;
diff --git a/pom.xml b/pom.xml
index 381355c..fd6d569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,8 @@
 		<javadoc.juneau.version>8.0.0</javadoc.juneau.version>
 		<juneauVersion>8.0.0</juneauVersion>
 		<juneauVersionNext>8.0.1</juneauVersionNext>
+		<maven.compiler.source>1.8</maven.compiler.source>
+		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
 
 	<dependencyManagement>
@@ -195,7 +197,7 @@
 						<excludePackageNames>*proto*:*samples*:*examples*:*test*:org.apache.juneau.doc.internal</excludePackageNames>
 						<linksource>true</linksource>
 						<links>
-							<link>http://docs.oracle.com/javase/7/docs/api/</link>
+							<link>http://docs.oracle.com/javase/8/docs/api/</link>
 							<link>http://docs.oracle.com/javaee/5/api/</link>
 						</links>
 						<docfilessubdirs>true</docfilessubdirs>


Mime
View raw message