-
Notifications
You must be signed in to change notification settings - Fork 441
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feat/equo-ide
- Loading branch information
Showing
53 changed files
with
1,157 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip | ||
| networkTimeout=10000 | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
lib/src/cleanthat/java/com/diffplug/spotless/glue/java/JavaCleanthatRefactorerFunc.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| /* | ||
| * Copyright 2023 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless.glue.java; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.diffplug.spotless.FormatterFunc; | ||
|
|
||
| import eu.solven.cleanthat.config.pojo.CleanthatEngineProperties; | ||
| import eu.solven.cleanthat.config.pojo.SourceCodeProperties; | ||
| import eu.solven.cleanthat.engine.java.IJdkVersionConstants; | ||
| import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorer; | ||
| import eu.solven.cleanthat.engine.java.refactorer.JavaRefactorerProperties; | ||
| import eu.solven.cleanthat.formatter.LineEnding; | ||
|
|
||
| /** | ||
| * The glue for CleanThat: it is build over the version in build.gradle, but at runtime it will be executed over | ||
| * the version loaded in JarState, which is by default defined in com.diffplug.spotless.java.CleanthatJavaStep#JVM_SUPPORT | ||
| */ | ||
| public class JavaCleanthatRefactorerFunc implements FormatterFunc { | ||
| private static final Logger LOGGER = LoggerFactory.getLogger(JavaCleanthatRefactorerFunc.class); | ||
|
|
||
| private String jdkVersion; | ||
| private List<String> included; | ||
| private List<String> excluded; | ||
| private boolean includeDraft; | ||
|
|
||
| public JavaCleanthatRefactorerFunc(String jdkVersion, List<String> included, List<String> excluded, boolean includeDraft) { | ||
| this.jdkVersion = jdkVersion == null ? IJdkVersionConstants.JDK_8 : jdkVersion; | ||
| this.included = included == null ? Collections.emptyList() : included; | ||
| this.excluded = excluded == null ? Collections.emptyList() : excluded; | ||
| this.includeDraft = includeDraft; | ||
| } | ||
|
|
||
| public JavaCleanthatRefactorerFunc() { | ||
| this(IJdkVersionConstants.JDK_8, Arrays.asList("SafeAndConsensual"), Arrays.asList(), false); | ||
| } | ||
|
|
||
| @Override | ||
| public String apply(String input) throws Exception { | ||
| // https://stackoverflow.com/questions/1771679/difference-between-threads-context-class-loader-and-normal-classloader | ||
| ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader(); | ||
| try { | ||
| // Ensure CleanThat main Thread has its custom classLoader while executing its refactoring | ||
| Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); | ||
| return doApply(input); | ||
| } finally { | ||
| // Restore the originalClassLoader | ||
| Thread.currentThread().setContextClassLoader(originalClassLoader); | ||
| } | ||
| } | ||
|
|
||
| private String doApply(String input) throws InterruptedException, IOException { | ||
| // call some API that uses reflection without taking ClassLoader param | ||
| CleanthatEngineProperties engineProperties = CleanthatEngineProperties.builder().engineVersion(jdkVersion).build(); | ||
|
|
||
| // Spotless will push us LF content | ||
| engineProperties.setSourceCode(SourceCodeProperties.builder().lineEnding(LineEnding.LF).build()); | ||
|
|
||
| JavaRefactorerProperties refactorerProperties = new JavaRefactorerProperties(); | ||
|
|
||
| refactorerProperties.setIncluded(included); | ||
| refactorerProperties.setExcluded(excluded); | ||
|
|
||
| refactorerProperties.setIncludeDraft(includeDraft); | ||
|
|
||
| JavaRefactorer refactorer = new JavaRefactorer(engineProperties, refactorerProperties); | ||
|
|
||
| LOGGER.debug("Processing sourceJdk={} included={} excluded={}", jdkVersion, included, excluded, includeDraft); | ||
| LOGGER.debug("Available mutators: {}", JavaRefactorer.getAllIncluded()); | ||
|
|
||
| // Spotless calls steps always with LF eol. | ||
| return refactorer.doFormat(input, LineEnding.LF); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
lib/src/main/java/com/diffplug/spotless/LazyArgLogger.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright 2023 DiffPlug | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.diffplug.spotless; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| /** | ||
| * This is a utility class to allow for lazy evaluation of arguments to be passed to a logger | ||
| * and thus avoid unnecessary computation of the arguments if the log level is not enabled. | ||
| */ | ||
| public final class LazyArgLogger { | ||
|
|
||
| private final Supplier<Object> argSupplier; | ||
|
|
||
| private LazyArgLogger(Supplier<Object> argSupplier) { | ||
| this.argSupplier = argSupplier; | ||
| } | ||
|
|
||
| public static LazyArgLogger lazy(Supplier<Object> argSupplier) { | ||
| return new LazyArgLogger(argSupplier); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return String.valueOf(argSupplier.get()); | ||
| } | ||
| } |
Oops, something went wrong.