Apply RSPEC-6112 over the whole repository

Author: blacelle

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java

@@ -168,7 +168,7 @@ public Bundle getBundle(String location) {
 	@Override
 	public ServiceReference<?>[] getAllServiceReferences(String clazz, String filter) throws InvalidSyntaxException {
 		//Filters are based on class names
-		String interfaceClassName = (null == clazz) ? filter : clazz;
+		var interfaceClassName = (null == clazz) ? filter : clazz;
 		return services.getReferences(interfaceClassName);
 	}
 

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java

@@ -63,7 +63,7 @@ class ResourceAccessor {
 	/** Resources are located in the JAR of the given class
 	 * @throws BundleException */
 	ResourceAccessor(Class<?> clazz) throws BundleException {
-		String bundleObjPath = clazz.getName();
+		var bundleObjPath = clazz.getName();
 		fatJarResourcePath = bundleObjPath.substring(0, bundleObjPath.lastIndexOf('.'));
 		try {
 			bundleFile = getBundlFile(clazz);
@@ -74,7 +74,7 @@ class ResourceAccessor {
 
 	private static BundleFile getBundlFile(Class<?> clazz) throws BundleException {
 		URI objUri = getBundleUri(clazz);
-		File jarOrDirectory = new File(objUri.getPath());
+		var jarOrDirectory = new File(objUri.getPath());
 		if (!(jarOrDirectory.exists() && jarOrDirectory.canRead())) {
 			throw new BundleException(String.format("Path '%s' for '%s' is not accessible exist on local file system.", objUri, clazz.getName()), BundleException.READ_ERROR);
 		}
@@ -87,7 +87,7 @@ private static BundleFile getBundlFile(Class<?> clazz) throws BundleException {
 
 	private static URI getBundleUri(Class<?> clazz) throws BundleException {
 		try {
-			URL objUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
+			var objUrl = clazz.getProtectionDomain().getCodeSource().getLocation();
 			return objUrl.toURI();
 		} catch (NullPointerException e) {
 			//No bunlde should be used for RT classes lookup. See also org.eclipse.core.runtime.PerformanceStats.
@@ -101,10 +101,10 @@ private static URI getBundleUri(Class<?> clazz) throws BundleException {
 
 	/** Get the manifest name from the resources. */
 	String getManifestName() throws BundleException {
-		URL manifestUrl = getEntry(JarFile.MANIFEST_NAME);
+		var manifestUrl = getEntry(JarFile.MANIFEST_NAME);
 		if (null != manifestUrl) {
 			try {
-				Manifest manifest = new Manifest(manifestUrl.openStream());
+				var manifest = new Manifest(manifestUrl.openStream());
 				String headerValue = manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
 				if (null == headerValue) {
 					throw new BundleException(String.format("Symbolic values not found in '%s'.", manifestUrl), BundleException.MANIFEST_ERROR);

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java

@@ -76,7 +76,7 @@ public void set(String key, String value) {
 
 	@Override
 	public <S> void add(Class<S> interfaceClass, S service) throws ServiceException {
-		String className = interfaceClass.getName();
+		var className = interfaceClass.getName();
 		if (null != className2Service.put(interfaceClass.getName(), new FrameworkServiceReference<S>(className, service))) {
 			throw new ServiceException(
 					String.format("Service '%s' is already registered.", interfaceClass.getName()), ServiceException.FACTORY_ERROR);

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java

@@ -39,7 +39,7 @@ public class PluginRegistrar {
 	private static final String PLUGIN_PROPERTIES = "plugin.properties";
 
 	public static BundleException register(Bundle bundle) {
-		PluginRegistrar registrar = new PluginRegistrar(bundle);
+		var registrar = new PluginRegistrar(bundle);
 		try {
 			registrar.register();
 		} catch (BundleException e) {

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java

@@ -459,7 +459,7 @@ public long getTime() {
 
 		@Override
 		public String toString() {
-			StringWriter result = new StringWriter();
+			var result = new StringWriter();
 			result.write(message);
 			if (execption.isPresent()) {
 				result.write('\n');

_ext/eclipse-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java

@@ -44,7 +44,7 @@ private TemporaryLocation(Location parent, URL defaultValue) {
 
 	private static URL createTemporaryDirectory() {
 		try {
-			Path location = Files.createTempDirectory(TEMP_PREFIX);
+			var location = Files.createTempDirectory(TEMP_PREFIX);
 			return location.toUri().toURL();
 		} catch (IOException e) {
 			throw new IOError(e);
@@ -120,7 +120,7 @@ public Location createLocation(Location parent, URL defaultValue, boolean readon
 	@Override
 	public URL getDataArea(String path) throws IOException {
 		try {
-			Path locationPath = Paths.get(location.toURI());
+			var locationPath = Paths.get(location.toURI());
 			return locationPath.resolve(path).toUri().toURL();
 		} catch (URISyntaxException e) {
 			throw new IOException("Location not correctly formatted.", e);
@@ -130,7 +130,7 @@ public URL getDataArea(String path) throws IOException {
 	@Override
 	public void close() throws Exception {
 		try {
-			Path path = Path.of(location.toURI());
+			var path = Path.of(location.toURI());
 			Files.walk(path)
 					.sorted(Comparator.reverseOrder())
 					.map(Path::toFile)

_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java

@@ -251,7 +251,7 @@ public void println(String x) {
 		@Override
 		public void println(Object x) {
 			if (x instanceof Exception) {
-				Exception e = (Exception) x;
+				var e = (Exception) x;
 				if (TEST_EXCEPTION_MESSAGE == e.getMessage()) {
 					messages.add(TEST_EXCEPTION_MESSAGE);
 				}

_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java

@@ -49,7 +49,7 @@ void testAddGet() throws BundleException {
 
 	@Test
 	void testSameSymbolicName() throws BundleException {
-		final String symbolicName = "sym.a";
+		final var symbolicName = "sym.a";
 		final long id1 = 12345;
 		final long id2 = 23456;
 		Bundle testBundle1 = new TestBundle(id1, symbolicName);
@@ -63,8 +63,8 @@ void testSameSymbolicName() throws BundleException {
 
 	@Test
 	void testSameID() throws BundleException {
-		final String symbolicName1 = "sym.a";
-		final String symbolicName2 = "sym.b";
+		final var symbolicName1 = "sym.a";
+		final var symbolicName2 = "sym.b";
 		final long id = 12345;
 		Bundle testBundle1 = new TestBundle(id, symbolicName1);
 		Bundle testBundle2 = new TestBundle(id, symbolicName2);

_ext/eclipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java

@@ -39,8 +39,8 @@ void initialize() {
 
 	@Test
 	void testAddGet() {
-		Service1 service1 = new Service1();
-		Service2 service2 = new Service2();
+		var service1 = new Service1();
+		var service2 = new Service2();
 		instance.add(Interf1.class, service1);
 		instance.add(Interf2a.class, service2);
 		instance.add(Interf2b.class, service2);
@@ -51,8 +51,8 @@ void testAddGet() {
 
 	@Test
 	void testMultipleServicesPerInterface() {
-		Service1 serviceX = new Service1();
-		Service1 serviceY = new Service1();
+		var serviceX = new Service1();
+		var serviceY = new Service1();
 		instance.add(Interf1.class, serviceX);
 		ServiceException e = assertThrows(ServiceException.class, () -> instance.add(Interf1.class, serviceY));
 		assertThat(e.getMessage()).as("ServiceException does not contain interface class name.").contains(Interf1.class.getName());

_ext/eclipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java

@@ -141,7 +141,7 @@ public void activatePlugins(SpotlessEclipsePluginConfig config) {
 			 * The HTML formatter only uses the DOCTYPE/SCHEMA for content model selection.
 			 * Hence no external URIs are required.
 			 */
-			boolean allowExternalURI = false;
+			var allowExternalURI = false;
 			EclipseXmlFormatterStepImpl.FrameworkConfig.activateXmlPlugins(config, allowExternalURI);
 			config.add(new HTMLCorePlugin());
 		}