Merge branch 'java-8'

This bumps the minimum Java version to Java 8. Woohoo!

Author: ctrueden

pom.xml

@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.scijava</groupId>
 		<artifactId>pom-scijava</artifactId>
-		<version>9.6.0</version>
+		<version>10.5.0</version>
 		<relativePath />
 	</parent>
 
 	<artifactId>scijava-common</artifactId>
-	<version>2.56.1-SNAPSHOT</version>
+	<version>2.57.0-SNAPSHOT</version>
 
 	<name>SciJava Common</name>
 	<description>SciJava Common is a shared library for SciJava software. It provides a plugin framework, with an extensible mechanism for service discovery, backed by its own annotation processor, so that plugins can be loaded dynamically. It is used by both ImageJ and SCIFIO.</description>
@@ -109,7 +109,7 @@
 	</ciManagement>
 
 	<properties>
-		<scijava.jvm.test.version>1.8</scijava.jvm.test.version>
+		<scijava.jvm.version>1.8</scijava.jvm.version>
 		<scijava-expression-parser.version>3.0.0</scijava-expression-parser.version>
 	</properties>
 

src/main/java/org/scijava/AbstractBasicDetails.java

@@ -53,7 +53,7 @@ public abstract class AbstractBasicDetails implements BasicDetails {
 	private String description;
 
 	/** Table of extra key/value pairs. */
-	private final Map<String, String> values = new HashMap<String, String>();
+	private final Map<String, String> values = new HashMap<>();
 
 	// -- Object methods --
 

src/main/java/org/scijava/annotations/AbstractIndexWriter.java

@@ -61,7 +61,7 @@
 public abstract class AbstractIndexWriter {
 
 	private final Map<String, Map<String, Object>> map =
-		new ConcurrentSkipListMap<String, Map<String, Object>>();
+		new ConcurrentSkipListMap<>();
 
 	protected synchronized boolean foundAnnotations() {
 		return !map.isEmpty();
@@ -72,10 +72,10 @@ protected synchronized void add(final Map<String, Object> annotationValues,
 	{
 		Map<String, Object> list = map.get(annotationName);
 		if (list == null) {
-			list = new LinkedHashMap<String, Object>();
+			list = new LinkedHashMap<>();
 			map.put(annotationName, list);
 		}
-		final Map<String, Object> o = new TreeMap<String, Object>();
+		final Map<String, Object> o = new TreeMap<>();
 		o.put("class", className);
 		o.put("values", annotationValues);
 		list.put(className, o);
@@ -128,7 +128,7 @@ protected synchronized void merge(final String annotationName,
 		}
 		Map<String, Object> m = map.get(annotationName);
 		if (m == null) {
-			m = new LinkedHashMap<String, Object>();
+			m = new LinkedHashMap<>();
 			map.put(annotationName, m);
 		}
 		/*
@@ -184,7 +184,7 @@ else if (o instanceof Enum) {
 	}
 
 	protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
-		Map<String, Object> result = new TreeMap<String, Object>();
+		Map<String, Object> result = new TreeMap<>();
 		for (Method method : annotation.annotationType().getMethods())
 			try {
 				if (method.getDeclaringClass() == annotation.annotationType()) {
@@ -204,7 +204,7 @@ protected <A extends Annotation> Map<String, Object> adapt(A annotation) {
 	}
 
 	private static Map<String, Object> adapt(Enum<?> e) {
-		Map<String, Object> result = new TreeMap<String, Object>();
+		Map<String, Object> result = new TreeMap<>();
 		result.put("enum", e.getClass().getName());
 		result.put("value", e.name());
 		return result;

src/main/java/org/scijava/annotations/AnnotationCombiner.java

@@ -87,7 +87,7 @@ public void combine(File outputDirectory) throws Exception {
 
 	/** Scans for annotations files in every resource on the classpath. */
 	public Set<String> getAnnotationFiles() throws IOException {
-		final HashSet<String> files = new HashSet<String>();
+		final HashSet<String> files = new HashSet<>();
 
 		for (final String prefix : new String[] { PREFIX, LEGACY_PREFIX }) {
 			final Enumeration<URL> directories =

src/main/java/org/scijava/annotations/AnnotationProcessor.java

@@ -111,7 +111,7 @@ public boolean process(final Set<? extends TypeElement> elements,
 	private class Writer extends AbstractIndexWriter implements StreamFactory {
 
 		private final Map<String, List<Element>> originatingElements =
-			new HashMap<String, List<Element>>();
+			new HashMap<>();
 		private final Filer filer = processingEnv.getFiler();
 		private final Elements utils = processingEnv.getElementUtils();
 		private final Types typeUtils = processingEnv.getTypeUtils();
@@ -124,7 +124,7 @@ public void add(final TypeElement element) {
 				// remember originating elements
 				List<Element> originating = originatingElements.get(annotationName);
 				if (originating == null) {
-					originating = new ArrayList<Element>();
+					originating = new ArrayList<>();
 					originatingElements.put(annotationName, originating);
 				}
 
@@ -159,7 +159,7 @@ private Map<String, Object> adapt(
 			final List<? extends AnnotationMirror> mirrors,
 			final TypeMirror annotationType)
 		{
-			final Map<String, Object> result = new TreeMap<String, Object>();
+			final Map<String, Object> result = new TreeMap<>();
 			for (final AnnotationMirror mirror : mirrors) {
 				if (typeUtils.isSameType(mirror.getAnnotationType(), annotationType)) {
 					return (Map<String, Object>) adapt(mirror);
@@ -172,7 +172,7 @@ private Map<String, Object> adapt(
 		protected Object adapt(final Object o) {
 			if (o instanceof AnnotationMirror) {
 				final AnnotationMirror mirror = (AnnotationMirror) o;
-				final Map<String, Object> result = new TreeMap<String, Object>();
+				final Map<String, Object> result = new TreeMap<>();
 				for (final Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : mirror
 					.getElementValues().entrySet())
 				{
@@ -184,7 +184,7 @@ protected Object adapt(final Object o) {
 			}
 			else if (o instanceof List) {
 				final List<?> list = (List<?>) o;
-				final List<Object> result = new ArrayList<Object>(list.size());
+				final List<Object> result = new ArrayList<>(list.size());
 				for (final Object item : list) {
 					result.add(adapt(item));
 				}
@@ -197,7 +197,7 @@ else if (o instanceof TypeMirror) {
 			}
 			else if (o instanceof VariableElement) {
 				final VariableElement element = (VariableElement) o;
-				final Map<String, Object> result = new TreeMap<String, Object>();
+				final Map<String, Object> result = new TreeMap<>();
 				final String enumName =
 					utils.getBinaryName((TypeElement) element.getEnclosingElement())
 						.toString();

src/main/java/org/scijava/annotations/ByteCodeAnalyzer.java

@@ -204,7 +204,7 @@ private String getName() {
 
 	private Map<String, Map<String, Object>> getAnnotations() {
 		final Map<String, Map<String, Object>> annotations =
-			new TreeMap<String, Map<String, Object>>();
+			new TreeMap<>();
 		for (final Attribute attr : attributes) {
 			if ("RuntimeVisibleAnnotations".equals(attr.getName())) {
 				final byte[] buf = attr.attribute;
@@ -215,7 +215,7 @@ private Map<String, Map<String, Object>> getAnnotations() {
 						raw2className(getStringConstant(getU2(buf, offset)));
 					offset += 2;
 					final Map<String, Object> values =
-						new TreeMap<String, Object>();
+						new TreeMap<>();
 					annotations.put(className, values);
 					offset = parseAnnotationValues(buf, offset, values);
 				}
@@ -297,7 +297,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
 			}
 			case 'e': {
 				final Map<String, Object> enumValue =
-					new TreeMap<String, Object>();
+					new TreeMap<>();
 				enumValue.put("enum", raw2className(getStringConstant(getU2(buf,
 					offset))));
 				offset += 2;
@@ -309,7 +309,7 @@ private int parseAnnotationValue(byte[] buf, int offset,
 			case '@': {
 				// skipping annotation type
 				offset += 2;
-				final Map<String, Object> values = new TreeMap<String, Object>();
+				final Map<String, Object> values = new TreeMap<>();
 				offset = parseAnnotationValues(buf, offset, values);
 				value = values;
 				break;

src/main/java/org/scijava/annotations/EclipseHelper.java

@@ -98,7 +98,7 @@
 public class EclipseHelper extends DirectoryIndexer {
 
 	private static final String FORCE_ANNOTATION_INDEX_PROPERTY = "force.annotation.index";
-	static Set<URL> indexed = new HashSet<URL>();
+	static Set<URL> indexed = new HashSet<>();
 	private boolean bannerShown;
 
 	private static boolean debug =

src/main/java/org/scijava/annotations/Index.java

@@ -86,7 +86,7 @@ public static <A extends Annotation> Index<A> load(final Class<A> annotation,
 		final ClassLoader loader)
 	{
 		EclipseHelper.updateAnnotationIndex(loader);
-		return new Index<A>(annotation, loader);
+		return new Index<>(annotation, loader);
 	}
 
 	static final String INDEX_PREFIX = "META-INF/json/";
@@ -110,9 +110,9 @@ private class IndexItemIterator implements Iterator<IndexItem<A>> {
 		private Map<String, URL> legacyURLs;
 
 		public IndexItemIterator(final Class<A> annotation) {
-			seen = new HashSet<URL>();
+			seen = new HashSet<>();
 			try {
-				legacyURLs = new LinkedHashMap<String, URL>();
+				legacyURLs = new LinkedHashMap<>();
 				final Enumeration<URL> legacy =
 					loader.getResources(LEGACY_INDEX_PREFIX + annotation.getName());
 				final int legacySuffixLength =
@@ -160,7 +160,7 @@ private void readNext() throws IOException {
 					@SuppressWarnings("unchecked")
 					final Map<Object, Object> values =
 						(Map<Object, Object>) map.get("values");
-					next = new IndexItem<A>(annotation, loader, className, values);
+					next = new IndexItem<>(annotation, loader, className, values);
 					return;
 				}
 				indexReader.close();

src/main/java/org/scijava/annotations/IndexReader.java

@@ -84,7 +84,7 @@ public Object next() throws IOException {
 			return null;
 		}
 		if (c == '{') {
-			Map<String, Object> map = new LinkedHashMap<String, Object>();
+			Map<String, Object> map = new LinkedHashMap<>();
 			for (;;) {
 				if (expect('"', '}') == 1) {
 					return map;
@@ -99,7 +99,7 @@ public Object next() throws IOException {
 			}
 		}
 		if (c == '[') {
-			List<Object> list = new ArrayList<Object>();
+			List<Object> list = new ArrayList<>();
 			c = in.read();
 			if (c == ']') {
 				return list;

src/main/java/org/scijava/annotations/legacy/LegacyReader.java

@@ -83,7 +83,7 @@ public LegacyReader(final InputStream in) throws IOException {
 		if (version != STREAM_VERSION) {
 			throw new IOException("Unsupported version: " + version);
 		}
-		references = new ArrayList<Object>();
+		references = new ArrayList<>();
 	}
 
 	public void close() throws IOException {
@@ -260,7 +260,7 @@ protected NonPrimitiveClassDesc(final String className,
 			if ((fields.length % 2) != 0) {
 				throw new RuntimeException("That's odd: " + fields.length);
 			}
-			this.fields = new LinkedHashMap<String, ClassDesc>();
+			this.fields = new LinkedHashMap<>();
 			for (int i = 0; i < fields.length; i += 2) {
 				String name = (String) fields[i];
 				ClassDesc classDesc;
@@ -300,7 +300,7 @@ else if (c != TC_OBJECT) {
 
 		@Override
 		protected final Object readWithoutClassDesc() throws IOException {
-			final Map<String, Object> map = new LinkedHashMap<String, Object>();
+			final Map<String, Object> map = new LinkedHashMap<>();
 			int index = references.size();
 			references.add(map);
 			for (final String fieldName : order) {
@@ -357,7 +357,7 @@ public static String toSimpleName(Class<?> clazz) {
 	}
 
 	private final Map<String, ClassDesc> classDescs =
-		new HashMap<String, ClassDesc>();
+		new HashMap<>();
 
 	{
 		new ClassDesc("B") {
@@ -477,7 +477,7 @@ public Object readExtra(final Map<String, Object> map) throws IOException
 				expectToken(TC_BLOCKDATA);
 				expectToken(4);
 				int capacity = read32();
-				final List<Object> list = new ArrayList<Object>(capacity);
+				final List<Object> list = new ArrayList<>(capacity);
 				for (int i = 0; i < size; i++) {
 					list.add(readObject());
 				}