Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enforce var jdk11 applied #1609

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Enforce var jdk11 applied #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
958864d
Add cleanthat to spotless config
blacelle Feb 20, 2023
6e45c6f
Merge remote-tracking branch 'origin/main' into EnforceVar_jdk11
blacelle Mar 7, 2023
53f3fcf
Improve gradle configuration
blacelle Mar 7, 2023
4ee40fd
Merge remote-tracking branch 'origin' into EnforceVar_jdk11
blacelle Mar 30, 2023
2fdba8f
Apply RSPEC-6112 over the whole repository
blacelle Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...se-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
10 changes: 5 additions & 5 deletions ...se-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ResourceAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());
Copy link
Contributor

@thc202 thc202 Mar 7, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why wasn't the URI above replaced?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first sight, it would be a limitation around type resolution, due to file being processed one a per-file basis. Let me have a deeper look.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

UnsolvedSymbolException{context='null', name='BundleException', cause='null'}. One may argue this information is not relevant in this purpose. However, here it is: JavaParser, the source -> AST used to manipulate Java-Code failed resolving the type of getBundleUri(clazz) as given method refers to a type unknown in the context of given source file.

Similar technical challenge around #1379 (comment).

For now, Cleanthat focuses on linting on a per-file basis (for similar reason Spotless processes (for now) each file individually).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the explanation!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would think that any assignment could be a var and we don't need to know anything about its type. The only reason not to var is if it's a declaration without an assignment. Am I wrong?

Copy link
Contributor Author

@blacelle blacelle Mar 9, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can find the unitTests for this mutator in LocalVariableTypeInferenceCases. There is multiple cases with @UnmodifiedMethod, expressing switching to a var would be invalid.

Even List<?> i = new ArrayList<String>(); should not be switched to var as you may later assign a CopyOnWriteArrayList while var would have turned semantically from List to ArrayList (and you can't assign a CopyOnWriteArrayList into an ArrayList).

We may then suppose final List<?> i = new ArrayList<String>(); could be turned to var, however I may be missing another edge-case, which would lead in Cleanthat producing invalid code.

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);
}
Expand All @@ -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.
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...e-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion ...-base/src/main/java/com/diffplug/spotless/extra/eclipse/base/runtime/PluginRegistrar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion ...se/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/SingleSlf4JService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
6 changes: 3 additions & 3 deletions ...ase/src/main/java/com/diffplug/spotless/extra/eclipse/base/service/TemporaryLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/com/diffplug/spotless/extra/eclipse/base/SpotlessEclipseFrameworkTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions ...lipse-base/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/BundleSetTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions ...se/src/test/java/com/diffplug/spotless/extra/eclipse/base/osgi/ServiceCollectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion ...p/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/com/diffplug/spotless/extra/eclipse/wtp/html/StructuredDocumentProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions ...ipse-wtp/src/main/java/com/diffplug/spotless/extra/eclipse/wtp/sse/PluginPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseCssFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ...c/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseHtmlFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseJsonFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplAllowExternalURIsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplCatalogLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/com/diffplug/spotless/extra/eclipse/wtp/EclipseXmlFormatterStepImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions _ext/eclipse-wtp/src/test/java/com/diffplug/spotless/extra/eclipse/wtp/TestData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}

Expand All @@ -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));
}
Expand Down
4 changes: 4 additions & 0 deletions gradle/spotless.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ spotless {
java {
ratchetFrom 'origin/main'
bumpThisNumberIfACustomStepChanges(1)
// `setMutators` will discard default mutators
// https://sonarsource.atlassian.net/browse/RSPEC-6212
cleanthat().version("2.9").sourceCompatibility(project.sourceCompatibility.toString()).clearMutators()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe the sourceCompatibility could be set here?

spotless/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/JavaExtension.java

Lines 376 to 378 in 6789a1d

if (isLicenseHeaderStep(step)) {
return step.filterByFile(LicenseHeaderStep.unsupportedJvmFilesFilter());
} else {

Something like if (isCleanThatStep(step)) && sourceCompatibility == null) { ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not suceed doing so in the initial iteration. having a new look with your suggestion, I'm still stuck as I can not find sourceCompatiblity in Project: https://github.com/gradle/gradle/blob/v7.6.1/subprojects/core-api/src/main/java/org/gradle/api/Project.java, there is no sourceCompatiblity.

Yet, project.sourceCompatibility is OK in gradle files. What am I missing here?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://stackoverflow.com/a/72040924

.addMutator('RSPEC-6212')
licenseHeaderFile rootProject.file('gradle/spotless.license')
importOrderFile rootProject.file('gradle/spotless.importorder')
eclipse().configFile rootProject.file('gradle/spotless.eclipseformat.xml')
Expand Down
8 changes: 4 additions & 4 deletions ...a/src/groovy/java/com/diffplug/spotless/extra/glue/groovy/GrEclipseFormatterStepImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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()) {
Expand Down Expand Up @@ -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;
}
Expand Down