Apply RSPEC-6112 over the whole repository

_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());
 		}

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

@@ -63,7 +63,7 @@ public StructuredDocumentProcessor(IStructuredDocument document, String type,
 
 	/** Applies processor on document, using a given formatter */
 	public void apply(T formatter) {
-		for (int currentRegionId = 0; currentRegionId < numberOfRegions; currentRegionId++) {
+		for (var currentRegionId = 0; currentRegionId < numberOfRegions; currentRegionId++) {
 			applyOnRegion(currentRegionId, formatter);
 		}
 	}
@@ -132,7 +132,7 @@ public int getLastLine() {
 		}
 
 		private static int computeIndent(IStructuredDocument document, ITypedRegion region, String htmlIndent) {
-			int indent = 0;
+			var indent = 0;
 			try {
 				int lineNumber = document.getLineOfOffset(region.getOffset());
 				document.getNumberOfLines();
@@ -180,7 +180,7 @@ protected void fixTagIndent(MultiTextEdit modifications, int offset, String inde
 			int lineStart = document.getLineOffset(lineNumber);
 			int lineEnd = document.getLineOffset(lineNumber + 1);
 			String lineContent = document.get(lineStart, lineEnd - lineStart);
-			StringBuilder currentIndent = new StringBuilder();
+			var currentIndent = new StringBuilder();
 			lineContent.chars().filter(c -> {
 				if (c == ' ' || c == '\t') {
 					currentIndent.append(c);

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

@@ -96,9 +96,9 @@ public static void configureCatalog(final Properties properties, final ICatalog
 			throw new IllegalArgumentException("Internal error: Catalog implementation '" + defaultCatalogInterface.getClass().getCanonicalName() + "' unsupported.");
 		}
 		Catalog defaultCatalog = (Catalog) defaultCatalogInterface;
-		String catalogProperty = properties.getProperty(USER_CATALOG, "");
+		var catalogProperty = properties.getProperty(USER_CATALOG, "");
 		if (!catalogProperty.isEmpty()) {
-			final File catalogFile = new File(catalogProperty);
+			final var catalogFile = new File(catalogProperty);
 			try {
 				InputStream inputStream = new FileInputStream(catalogFile);
 				String orgBase = defaultCatalog.getBase();
@@ -118,7 +118,7 @@ public static void configureCatalog(final Properties properties, final ICatalog
 	public static void assertNoChanges(Plugin plugin, Properties properties) {
 		Objects.requireNonNull(properties, "Property values are missing.");
 		final String preferenceId = plugin.getBundle().getSymbolicName();
-		Properties originalValues = CONFIG.get(preferenceId);
+		var originalValues = CONFIG.get(preferenceId);
 		if (null == originalValues) {
 			throw new IllegalArgumentException("No configuration found for " + preferenceId);
 		}

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java

@@ -41,7 +41,7 @@ void initialize() throws Exception {
 		 * All formatter configuration is stored in
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.css.core.prefs.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(INDENTATION_SIZE, "3");
 		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
 		properties.put(CLEANUP_CASE_SELECTOR, Integer.toString(UPPER)); //Done by cleanup

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java

@@ -40,7 +40,7 @@ void initialize() throws Exception {
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
 		 * So a simple test of one configuration item change is considered sufficient.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(CLEANUP_TAG_NAME_CASE, Integer.toString(HTMLCorePreferenceNames.UPPER)); //HTML config
 		properties.put(FORMATTER_INSERT_SPACE_BEFORE_SEMICOLON, JavaScriptCore.INSERT); //JS config
 		properties.put(QUOTE_ATTR_VALUES, "TRUE"); //CSS config
@@ -89,7 +89,7 @@ void formatCSS() throws Exception {
 
 	@Test
 	void checkCleanupForNonUtf8() throws Exception {
-		String osEncoding = System.getProperty("file.encoding");
+		var osEncoding = System.getProperty("file.encoding");
 		System.setProperty("file.encoding", "ISO-8859-1"); //Simulate a non UTF-8 OS
 		String[] input = testData.input("utf-8.html");
 		String output = formatter.format(input[0]);

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java

@@ -50,7 +50,7 @@ void initialize() throws Exception {
 		 * All formatter configuration is stored in
 		 * org.eclipse.core.runtime/.settings/org.eclipse.jst.jsdt.core.prefs.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.setProperty(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR, JavaScriptCore.TAB);
 		formatter = new EclipseJsFormatterStepImpl(properties);
 	}

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java

@@ -41,7 +41,7 @@ void initialize() throws Exception {
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.json.core.prefs.
 		 * So a simple test of one configuration item change is considered sufficient.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(INDENTATION_SIZE, "3"); //Default is 1
 		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
 		properties.put(CASE_PROPERTY_NAME, Integer.toString(UPPER)); //Dead code, ignored

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java

@@ -41,7 +41,7 @@ void initializeStatic() throws Exception {
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
 		 * So a simple test of one configuration item change is considered sufficient.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(PluginPreferences.RESOLVE_EXTERNAL_URI, "TRUE");
 		properties.put(INDENTATION_SIZE, "2");
 		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java

@@ -41,7 +41,7 @@ void initializeStatic() throws Exception {
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
 		 * So a simple test of one configuration item change is considered sufficient.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(INDENTATION_SIZE, "2");
 		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
 		properties.put(PluginPreferences.USER_CATALOG, testData.getRestrictionsPath("catalog.xml").toString());

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java

@@ -42,7 +42,7 @@ void initialize() throws Exception {
 		 * org.eclipse.core.runtime/.settings/org.eclipse.wst.xml.core.prefs.
 		 * So a simple test of one configuration item change is considered sufficient.
 		 */
-		Properties properties = new Properties();
+		var properties = new Properties();
 		properties.put(INDENTATION_SIZE, "2");
 		properties.put(INDENTATION_CHAR, SPACE); //Default is TAB
 		formatter = new EclipseXmlFormatterStepImpl(properties);

_ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java

@@ -22,8 +22,8 @@
 
 public class TestData {
 	public static TestData getTestDataOnFileSystem(String kind) {
-		final String userDir = System.getProperty("user.dir", ".");
-		Path dataPath = Paths.get(userDir, "src", "test", "resources", kind);
+		final var userDir = System.getProperty("user.dir", ".");
+		var dataPath = Paths.get(userDir, "src", "test", "resources", kind);
 		if (Files.isDirectory(dataPath)) {
 			return new TestData(dataPath);
 		}
@@ -46,12 +46,12 @@ private TestData(Path dataPath) {
 	}
 
 	public String[] input(final String fileName) throws Exception {
-		Path xmlPath = inputPath.resolve(fileName);
+		var xmlPath = inputPath.resolve(fileName);
 		return new String[]{read(xmlPath), xmlPath.toString()};
 	}
 
 	public String expected(final String fileName) {
-		Path xmlPath = expectedPath.resolve(fileName);
+		var xmlPath = expectedPath.resolve(fileName);
 		return read(xmlPath);
 	}
 
@@ -60,15 +60,15 @@ private String read(final Path xmlPath) {
 			throw new IllegalArgumentException(String.format("'%1$s' is not a regular file.", xmlPath));
 		}
 		try {
-			String checkedOutFileContent = new String(java.nio.file.Files.readAllBytes(xmlPath), "UTF8");
+			var checkedOutFileContent = new String(java.nio.file.Files.readAllBytes(xmlPath), "UTF8");
 			return checkedOutFileContent.replace("\r", ""); //Align GIT end-of-line normalization
 		} catch (IOException e) {
 			throw new IllegalArgumentException(String.format("Failed to read '%1$s'.", xmlPath), e);
 		}
 	}
 
 	public Path getRestrictionsPath(String fileName) {
-		Path filePath = restrictionsPath.resolve(fileName);
+		var filePath = restrictionsPath.resolve(fileName);
 		if (!Files.exists(filePath)) {
 			throw new IllegalArgumentException(String.format("'%1$s' is not a restrictions file.", fileName));
 		}

lib-extra/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java

@@ -89,7 +89,7 @@ public GrEclipseFormatterStepImpl(final Properties properties) throws Exception
 	/** Formatting Groovy string  */
 	public String format(String raw) throws Exception {
 		IDocument doc = new Document(raw);
-		GroovyErrorListener errorListener = new GroovyErrorListener();
+		var errorListener = new GroovyErrorListener();
 		TextSelection selectAll = new TextSelection(doc, 0, doc.getLength());
 		GroovyFormatter codeFormatter = new DefaultGroovyFormatter(selectAll, doc, preferencesStore, false);
 		TextEdit edit = codeFormatter.format();
@@ -135,7 +135,7 @@ public boolean errorsDetected() {
 
 		@Override
 		public String toString() {
-			StringBuilder string = new StringBuilder();
+			var string = new StringBuilder();
 			if (1 < errors.size()) {
 				string.append("Multiple problems detected during step execution:");
 			} else if (0 == errors.size()) {
@@ -168,9 +168,9 @@ public void log(TraceCategory arg0, String arg1) {
 
 	private static PreferenceStore createPreferences(final Properties properties) throws IOException {
 		final PreferenceStore preferences = new PreferenceStore();
-		ByteArrayOutputStream output = new ByteArrayOutputStream();
+		var output = new ByteArrayOutputStream();
 		properties.store(output, null);
-		ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
+		var input = new ByteArrayInputStream(output.toByteArray());
 		preferences.load(input);
 		return preferences;
 	}