diff --git a/aot-plugin/src/main/java/io/micronaut/gradle/aot/MicronautAotPlugin.java b/aot-plugin/src/main/java/io/micronaut/gradle/aot/MicronautAotPlugin.java index b8fa8da0..0090f7e6 100644 --- a/aot-plugin/src/main/java/io/micronaut/gradle/aot/MicronautAotPlugin.java +++ b/aot-plugin/src/main/java/io/micronaut/gradle/aot/MicronautAotPlugin.java @@ -62,7 +62,6 @@ import java.io.IOException; import java.nio.file.Files; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -80,7 +79,7 @@ public abstract class MicronautAotPlugin implements Plugin { public static final String OPTIMIZED_DIST_NAME = "optimized"; public static final String MAIN_BINARY_NAME = "main"; - static final List TYPES_TO_CHECK = Collections.unmodifiableList(Arrays.asList( + static final List TYPES_TO_CHECK = List.of( "io.reactivex.Observable", "reactor.core.publisher.Flux", "kotlinx.coroutines.flow.Flow", @@ -96,9 +95,10 @@ public abstract class MicronautAotPlugin implements Plugin { "io.methvin.watchservice.MacOSXListeningWatchService", "io.micronaut.core.async.publisher.CompletableFuturePublisher", "io.micronaut.core.async.publisher.Publishers.JustPublisher", - "io.micronaut.core.async.subscriber.Completable")); + "io.micronaut.core.async.subscriber.Completable" + ); - public static final List SERVICE_TYPES = Collections.unmodifiableList(Arrays.asList( + public static final List SERVICE_TYPES = List.of( "io.micronaut.context.env.PropertySourceLoader", "io.micronaut.inject.BeanConfiguration", "io.micronaut.inject.BeanDefinitionReference", @@ -107,7 +107,7 @@ public abstract class MicronautAotPlugin implements Plugin { "io.micronaut.core.beans.BeanIntrospectionReference", "io.micronaut.core.convert.TypeConverterRegistrar", "io.micronaut.context.env.PropertyExpressionResolver" - )); + ); public static final String AOT_APPLICATION_CLASSPATH = "aotApplicationClasspath"; public static final String OPTIMIZED_RUNTIME_CLASSPATH_CONFIGURATION_NAME = "optimizedRuntimeClasspath"; public static final String DEFAULT_GENERATED_PACKAGE = "io.micronaut.aot.generated"; @@ -139,7 +139,7 @@ private void configureAotDefaults(Project project, AOTExtension aotExtension) { JavaApplication javaApplication = project.getExtensions().findByType(JavaApplication.class); if (javaApplication != null) { String mainClass = javaApplication.getMainClass().get(); - return mainClass.contains(".") ? mainClass.substring(0, mainClass.lastIndexOf(".")) : DEFAULT_GENERATED_PACKAGE; + return mainClass.contains(".") ? mainClass.substring(0, mainClass.lastIndexOf('.')) : DEFAULT_GENERATED_PACKAGE; } return DEFAULT_GENERATED_PACKAGE; })); @@ -160,9 +160,9 @@ private void registerPrepareOptimizationsTasks(Project project, Configurations c } private void registerCreateSamplesTasks(Project project, Configuration optimizerRuntimeClasspath, Configuration applicationClasspath, TaskContainer tasks, AOTExtension aotExtension) { - TaskProvider createAotSampleConfigurationFiles = tasks.register("createAotSampleConfigurationFiles", task -> { - task.setDescription("Generates Micronaut AOT sample configuration files"); - }); + TaskProvider createAotSampleConfigurationFiles = tasks.register("createAotSampleConfigurationFiles", task -> + task.setDescription("Generates Micronaut AOT sample configuration files") + ); for (OptimizerIO.TargetRuntime targetRuntime : OptimizerIO.TargetRuntime.values()) { TaskProvider createSample = tasks.register("createAot" + targetRuntime.getCapitalizedName() + "Sample", MicronautAotSampleConfTask.class, task -> { task.setDescription("Creates a sample " + targetRuntime.getCapitalizedName() + " AOT configuration file"); @@ -320,13 +320,13 @@ private void registerJavaExecOptimizedRun(Project project, // https://github.com/micronaut-projects/micronaut-gradle-plugin/issues/385 task.getOutputs().upToDateWhen(t -> false); task.setClasspath(project.files(jarTask, optimizedRuntimeClasspath)); - task.doFirst(new Action() { + task.doFirst(new Action<>() { @Override public void execute(Task t) { if (task.getLogger().isDebugEnabled()) { task.getLogger().debug( "Running optimized entry point: " + task.getMainClass().get() + - "\nClasspath:\n " + task.getClasspath().getFiles() + "\nClasspath:\n " + task.getClasspath().getFiles() .stream() .map(File::getName) .collect(Collectors.joining("\n ")) diff --git a/aot-plugin/src/main/java/io/micronaut/gradle/aot/OptimizerIO.java b/aot-plugin/src/main/java/io/micronaut/gradle/aot/OptimizerIO.java index 1f3b88cc..bbd5b9f2 100644 --- a/aot-plugin/src/main/java/io/micronaut/gradle/aot/OptimizerIO.java +++ b/aot-plugin/src/main/java/io/micronaut/gradle/aot/OptimizerIO.java @@ -46,13 +46,10 @@ public String getSimpleName() { } public String getCapitalizedName() { - switch (this) { - case JIT: - return "Jit"; - case NATIVE: - return "Native"; - } - return name(); + return switch (this) { + case JIT -> "Jit"; + case NATIVE -> "Native"; + }; } } } diff --git a/buildSrc/src/main/groovy/io/micronaut/internal/build/sourcegen/SimpleSourceProcessor.java b/buildSrc/src/main/groovy/io/micronaut/internal/build/sourcegen/SimpleSourceProcessor.java index 4827eb6d..f58d3cc4 100644 --- a/buildSrc/src/main/groovy/io/micronaut/internal/build/sourcegen/SimpleSourceProcessor.java +++ b/buildSrc/src/main/groovy/io/micronaut/internal/build/sourcegen/SimpleSourceProcessor.java @@ -59,11 +59,11 @@ public void process() throws IOException { if (Files.isDirectory(path)) { Files.createDirectories(target); } else if (Files.isRegularFile(path)) { - String contents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8); + String contents = Files.readString(path); for (Map.Entry entry : replacements.entrySet()) { contents = contents.replace(entry.getKey(), entry.getValue()); } - Files.write(target, contents.getBytes(StandardCharsets.UTF_8)); + Files.writeString(target, contents); } } catch (IOException e) { throw new GradleException("Unable to create target directory " + target, e); diff --git a/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java b/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java index 3362d4ac..b72db905 100644 --- a/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java +++ b/crac-plugin/src/main/java/io/micronaut/gradle/crac/MicronautCRaCPlugin.java @@ -282,7 +282,7 @@ private Optional> configureFinalDockerBuild(Pr } task.getImages().set(Collections.singletonList(project.getName())); task.getInputDir().set(dockerFileTask.flatMap(Dockerfile::getDestDir)); - task.doLast(new Action() { + task.doLast(new Action<>() { @Override public void execute(Task t) { t.getLogger().warn("**********************************************************"); diff --git a/docker-plugin/src/main/java/io/micronaut/gradle/docker/MicronautDockerPlugin.java b/docker-plugin/src/main/java/io/micronaut/gradle/docker/MicronautDockerPlugin.java index 8b432c36..afbfd07e 100644 --- a/docker-plugin/src/main/java/io/micronaut/gradle/docker/MicronautDockerPlugin.java +++ b/docker-plugin/src/main/java/io/micronaut/gradle/docker/MicronautDockerPlugin.java @@ -96,7 +96,7 @@ private static String adaptTaskName(String baseName, String context) { private void createDockerImage(Project project, MicronautDockerImage imageSpec) { TaskContainer tasks = project.getTasks(); String imageName = imageSpec.getName(); - project.getLogger().info("Creating docker tasks for image " + imageName); + project.getLogger().info("Creating docker tasks for image {}", imageName); TaskProvider buildLayersTask = tasks.register(adaptTaskName("buildLayers", imageName), BuildLayersTask.class, task -> { task.setGroup(BasePlugin.BUILD_GROUP); task.setDescription("Builds application layers for use in a Docker container (" + imageName + " image)"); @@ -307,7 +307,7 @@ private TaskProvider configureNativeDockerBuild(Project p ); task.getRemotePath().set("/function/function.zip"); task.getHostPath().set(lambdaZip); - task.doLast(new Action() { + task.doLast(new Action<>() { @Override public void execute(Task task1) { System.out.println("AWS Lambda ZIP built: " + lambdaZip.get()); diff --git a/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java b/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java index dea83712..6312ed78 100644 --- a/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java +++ b/docker-plugin/src/main/java/io/micronaut/gradle/docker/NativeImageDockerfile.java @@ -40,7 +40,6 @@ import javax.inject.Inject; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -56,9 +55,9 @@ */ public abstract class NativeImageDockerfile extends Dockerfile implements DockerBuildOptions { - private static final List SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableList( + private static final List SUPPORTED_JAVA_VERSIONS = List.of( // keep those in descending order - Arrays.asList(17) + 17 ); private static final String ARM_ARCH = "aarch64"; private static final String X86_64_ARCH = "x64"; @@ -369,10 +368,10 @@ public DirectoryProperty getPgoProfilesDirectory() { ); //noinspection Convert2Lambda - doLast(new Action() { + doLast(new Action<>() { @Override public void execute(Task task) { - java.io.File f = NativeImageDockerfile.this.getDestFile().get().getAsFile(); + java.io.File f = getDestFile().get().getAsFile(); System.out.println("Dockerfile written to: " + f.getAbsolutePath()); } }); @@ -589,7 +588,7 @@ private List buildNativeImageCommandLineArgs(Provider executable private static Integer toMajorVersion(String version) { if (version.contains(".")) { - return Integer.parseInt(version.substring(0, version.indexOf("."))); + return Integer.parseInt(version.substring(0, version.indexOf('.'))); } return Integer.parseInt(version); } @@ -692,7 +691,7 @@ public NativeImageDockerfile baseImage(String imageName) { @Override public DockerBuildOptions exportPorts(Integer... ports) { - this.getExposedPorts().set(Arrays.asList(ports)); + this.getExposedPorts().set(List.of(ports)); return this; } diff --git a/docker-plugin/src/main/java/io/micronaut/gradle/docker/tasks/BuildLayersTask.java b/docker-plugin/src/main/java/io/micronaut/gradle/docker/tasks/BuildLayersTask.java index f02c2865..0425ac3d 100644 --- a/docker-plugin/src/main/java/io/micronaut/gradle/docker/tasks/BuildLayersTask.java +++ b/docker-plugin/src/main/java/io/micronaut/gradle/docker/tasks/BuildLayersTask.java @@ -75,21 +75,11 @@ private static Provider layerDirectoryOf(Layer layer, Provider libsDir, Provider resourcesDir, Provider classesDir) { - Provider layerDir = libsDir; - switch (layer.getLayerKind().get()) { - case APP: - layerDir = appDir; - break; - case LIBS: - layerDir = libsDir; - break; - case EXPANDED_CLASSES: - layerDir = classesDir; - break; - case EXPANDED_RESOURCES: - layerDir = resourcesDir; - break; - } - return layerDir; + return switch (layer.getLayerKind().get()) { + case APP -> appDir; + case LIBS -> libsDir; + case EXPANDED_CLASSES -> classesDir; + case EXPANDED_RESOURCES -> resourcesDir; + }; } } diff --git a/functional-tests/src/test/groovy/io/micronaut/gradle/aot/BasicMicronautAOTSpec.groovy b/functional-tests/src/test/groovy/io/micronaut/gradle/aot/BasicMicronautAOTSpec.groovy index 3dca688d..448f2d35 100644 --- a/functional-tests/src/test/groovy/io/micronaut/gradle/aot/BasicMicronautAOTSpec.groovy +++ b/functional-tests/src/test/groovy/io/micronaut/gradle/aot/BasicMicronautAOTSpec.groovy @@ -253,7 +253,7 @@ class BasicMicronautAOTSpec extends AbstractAOTPluginSpec { private String subpath(File fullpath, File basePath) { def path = fullpath.getAbsolutePath() - path.substring(basePath.getAbsolutePath().length() + 1, path.size()) + path.substring(basePath.getAbsolutePath().length() + 1, path.size()).replaceAll("\\\\", "/") } } \ No newline at end of file diff --git a/graalvm-plugin/src/main/java/io/micronaut/gradle/graalvm/MicronautGraalPlugin.java b/graalvm-plugin/src/main/java/io/micronaut/gradle/graalvm/MicronautGraalPlugin.java index bb4dabc9..b87f14dd 100644 --- a/graalvm-plugin/src/main/java/io/micronaut/gradle/graalvm/MicronautGraalPlugin.java +++ b/graalvm-plugin/src/main/java/io/micronaut/gradle/graalvm/MicronautGraalPlugin.java @@ -22,8 +22,6 @@ import org.gradle.language.jvm.tasks.ProcessResources; import java.io.File; -import java.util.Arrays; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Objects; @@ -44,13 +42,13 @@ public class MicronautGraalPlugin implements Plugin { public static final String RICH_OUTPUT_PROPERTY = "io.micronaut.graalvm.rich.output"; - private static final Set SOURCE_SETS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("main", "test"))); - private static final List GRAALVM_MODULE_EXPORTS = Collections.unmodifiableList(Arrays.asList( + private static final Set SOURCE_SETS = Set.of("main", "test"); + private static final List GRAALVM_MODULE_EXPORTS = List.of( "org.graalvm.nativeimage.builder/com.oracle.svm.core.configure", "org.graalvm.nativeimage.builder/com.oracle.svm.core.jdk", "org.graalvm.nativeimage.builder/com.oracle.svm.core.jni", "org.graalvm.sdk/org.graalvm.nativeimage.impl" - )); + ); @Override public void apply(Project project) { diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/AnnotationProcessing.java b/minimal-plugin/src/main/java/io/micronaut/gradle/AnnotationProcessing.java index 6b4d5d7b..ec8c872e 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/AnnotationProcessing.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/AnnotationProcessing.java @@ -109,7 +109,7 @@ public AnnotationProcessingConfigBuilder group(String name) { @Override public AnnotationProcessingConfigBuilder annotations(String... annotations) { - if (annotations != null && annotations.length > 0) { + if (annotations != null) { for (String annotation : annotations) { if (annotation != null) { this.annotations.add(annotation); diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautComponentPlugin.java b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautComponentPlugin.java index 89b748c5..c6dc97ce 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautComponentPlugin.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautComponentPlugin.java @@ -155,7 +155,7 @@ private static void configureSourceSet(Project project, SourceSet sourceSet, Con .getAnnotationProcessorConfigurationName(); String implementationConfigurationName = sourceSet .getImplementationConfigurationName(); - List both = Arrays.asList( + List both = List.of( implementationConfigurationName, annotationProcessorConfigurationName ); @@ -214,13 +214,13 @@ private void configureJava(Project project, TaskContainer tasks) { if (!annotations.isEmpty()) { compilerArgs.add("-Amicronaut.processing.annotations=" + String.join(",", annotations)); } else { - if (group.length() > 0) { + if (!group.isEmpty()) { compilerArgs.add("-Amicronaut.processing.annotations=" + group + ".*"); } } } - if (group.length() > 0) { + if (!group.isEmpty()) { compilerArgs.add("-Amicronaut.processing.group=" + group); compilerArgs.add("-Amicronaut.processing.module=" + module); } diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautKotlinSupport.java b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautKotlinSupport.java index c912d104..5765b489 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautKotlinSupport.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautKotlinSupport.java @@ -16,7 +16,6 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions; import org.jetbrains.kotlin.gradle.plugin.KaptExtension; -import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -34,17 +33,17 @@ * @since 1.0.0 */ public class MicronautKotlinSupport { - private static final String[] KAPT_CONFIGURATIONS = new String[]{ + private static final String[] KAPT_CONFIGURATIONS = { "kapt", "kaptTest" }; - private static final String[] KSP_CONFIGURATIONS = new String[]{ + private static final String[] KSP_CONFIGURATIONS = { "ksp", "kspTest" }; public static final String KOTLIN_PROCESSORS = "kotlinProcessors"; - private static final List KSP_ANNOTATION_PROCESSOR_MODULES = Arrays.asList("inject-kotlin"); + private static final List KSP_ANNOTATION_PROCESSOR_MODULES = List.of("inject-kotlin"); public static void whenKotlinSupportPresent(Project p, Consumer action) { p.getPluginManager().withPlugin("org.jetbrains.kotlin.jvm", unused -> action.accept(p)); @@ -97,7 +96,7 @@ private static void configureKsp(Project project) { final String module = processingConfig.getModule().getOrElse(project.getName()); if (isIncremental) { kspExtension.arg("micronaut.processing.incremental", "true"); - if (group.length() > 0) { + if (!group.isEmpty()) { kspExtension.arg("micronaut.processing.group", group); } kspExtension.arg("micronaut.processing.module", module); @@ -124,12 +123,12 @@ private static void configureKapt(Project project) { if (!annotations.isEmpty()) { options.arg("micronaut.processing.annotations", String.join(",", annotations)); } else { - if (group.length() > 0) { + if (!group.isEmpty()) { options.arg("micronaut.processing.annotations", group + ".*"); } } - if (group.length() > 0) { + if (!group.isEmpty()) { options.arg("micronaut.processing.group", group); } options.arg("micronaut.processing.module", module); @@ -208,7 +207,7 @@ private static void configureAdditionalSourceSet(String compilerType, String annotationProcessorConfigurationName = compilerType + Strings.capitalize(sourceSet.getName()); String implementationConfigurationName = sourceSet .getImplementationConfigurationName(); - List both = Arrays.asList( + List both = List.of( implementationConfigurationName, annotationProcessorConfigurationName ); diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautMinimalApplicationPlugin.java b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautMinimalApplicationPlugin.java index 38ef6456..7c7b1c9c 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautMinimalApplicationPlugin.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautMinimalApplicationPlugin.java @@ -37,10 +37,8 @@ import org.gradle.api.tasks.TaskContainer; import java.io.File; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -56,12 +54,10 @@ public class MicronautMinimalApplicationPlugin implements Plugin { // This flag is used for testing purposes only public static final String INTERNAL_CONTINUOUS_FLAG = "io.micronaut.internal.gradle.continuous"; - private static final Map LOGGER_CONFIG_FILE_TO_DEPENDENCY = Collections.unmodifiableMap(new HashMap() { - { - put("logback.xml", "ch.qos.logback:logback-classic"); - put("simplelogger.properties", "org.slf4j:slf4j-simple"); - } - }); + private static final Map LOGGER_CONFIG_FILE_TO_DEPENDENCY = Map.of( + "logback.xml", "ch.qos.logback:logback-classic", + "simplelogger.properties", "org.slf4j:slf4j-simple" + ); @Override public void apply(Project project) { @@ -119,7 +115,7 @@ private void configureJavaExecTasks(Project project, Configuration developmentOn sysProps.put("micronaut.io.watch.restart", true); sysProps.put("micronaut.io.watch.enabled", true); //noinspection Convert2Lambda - javaExec.doFirst(new Action() { + javaExec.doFirst(new Action<>() { @Override public void execute(Task workaroundEagerSystemProps) { String watchPaths = sourceSet @@ -205,7 +201,7 @@ private void configureGoogleCloudFunctionRuntime(Project project, Project p, Dep run.dependsOn(taskContainer.findByName("processResources"), taskContainer.findByName("classes")); run.getMainClass().set("com.google.cloud.functions.invoker.runner.Invoker"); run.setClasspath(ic); - run.setArgs(Arrays.asList( + run.setArgs(List.of( "--target", "io.micronaut.gcp.function.http.HttpFunction", "--port", 8080 )); diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautTestRuntime.java b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautTestRuntime.java index ec0b2ada..88bbafb1 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautTestRuntime.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/MicronautTestRuntime.java @@ -1,8 +1,11 @@ package io.micronaut.gradle; -import org.gradle.api.plugins.JavaPlugin; +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Map; -import java.util.*; +import org.gradle.api.plugins.JavaPlugin; /** * An enum with the different supported test runtimes. @@ -16,7 +19,7 @@ public enum MicronautTestRuntime { */ JUNIT_5(MicronautExtension.mapOf( JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, - Arrays.asList("org.junit.jupiter:junit-jupiter-api", "io.micronaut.test:micronaut-test-junit5"), + List.of("org.junit.jupiter:junit-jupiter-api", "io.micronaut.test:micronaut-test-junit5"), JavaPlugin.TEST_RUNTIME_ONLY_CONFIGURATION_NAME, Collections.singletonList("org.junit.jupiter:junit-jupiter-engine") ), true), @@ -27,7 +30,7 @@ public enum MicronautTestRuntime { JavaPlugin.TEST_COMPILE_ONLY_CONFIGURATION_NAME, Collections.singletonList("io.micronaut:micronaut-inject-groovy"), JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, - Arrays.asList( + List.of( "org.spockframework:spock-core", "io.micronaut.test:micronaut-test-spock", "org.apache.groovy:groovy" @@ -40,7 +43,7 @@ public enum MicronautTestRuntime { MicronautKotlinSupport.KOTLIN_PROCESSORS, Collections.singletonList("io.micronaut:micronaut-inject-java"), JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, - Arrays.asList( + List.of( "io.mockk:mockk", "io.micronaut.test:micronaut-test-kotest", "io.kotest:kotest-assertions-core-jvm" @@ -56,7 +59,7 @@ public enum MicronautTestRuntime { MicronautKotlinSupport.KOTLIN_PROCESSORS, Collections.singletonList("io.micronaut:micronaut-inject-java"), JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME, - Arrays.asList( + List.of( "io.mockk:mockk", "io.micronaut.test:micronaut-test-kotest5", "io.kotest:kotest-assertions-core-jvm" @@ -90,21 +93,18 @@ public static MicronautTestRuntime parse(String str) { if (str != null) { str = str.toUpperCase(Locale.ENGLISH); switch (str) { - case "JUNIT": - case "JUNIT5": - case "JUNIT_5": + case "JUNIT", "JUNIT5", "JUNIT_5" -> { return MicronautTestRuntime.JUNIT_5; - case "SPOCK": - case "SPOCK2": - case "SPOCK_2": + } + case "SPOCK", "SPOCK2", "SPOCK_2" -> { return MicronautTestRuntime.SPOCK_2; - case "KOTEST": - case "KOTEST4": - case "KOTEST_4": + } + case "KOTEST", "KOTEST4", "KOTEST_4" -> { return MicronautTestRuntime.KOTEST_4; - case "KOTEST5": - case "KOTEST_5": + } + case "KOTEST5", "KOTEST_5" -> { return MicronautTestRuntime.KOTEST_5; + } } } return MicronautTestRuntime.NONE; diff --git a/minimal-plugin/src/main/java/io/micronaut/gradle/PluginsHelper.java b/minimal-plugin/src/main/java/io/micronaut/gradle/PluginsHelper.java index 7299c744..b0c73cce 100644 --- a/minimal-plugin/src/main/java/io/micronaut/gradle/PluginsHelper.java +++ b/minimal-plugin/src/main/java/io/micronaut/gradle/PluginsHelper.java @@ -207,11 +207,11 @@ static void applyAdditionalProcessors(Project project, String... configurations) project.afterEvaluate(p -> { final DependencySet allDependencies = project.getConfigurations().getByName(config) .getAllDependencies(); - for (String group : GROUP_TO_PROCESSOR_MAP.keySet()) { - boolean hasDep = !allDependencies.matching(dependency -> Objects.equals(dependency.getGroup(), group)).isEmpty(); + for (var entry : GROUP_TO_PROCESSOR_MAP.entrySet()) { + boolean hasDep = !allDependencies.matching(dependency -> Objects.equals(dependency.getGroup(), entry.getKey())).isEmpty(); if (hasDep) { for (String configuration : configurations) { - AutomaticDependency automaticDependency = GROUP_TO_PROCESSOR_MAP.get(group); + AutomaticDependency automaticDependency = entry.getValue(); automaticDependency.withConfiguration(configuration).applyTo(project); } } diff --git a/minimal-plugin/src/test/groovy/io/micronaut/gradle/MicronautDeprecationsPluginSpec.groovy b/minimal-plugin/src/test/groovy/io/micronaut/gradle/MicronautDeprecationsPluginSpec.groovy index 616fb1d0..a6bc0acd 100644 --- a/minimal-plugin/src/test/groovy/io/micronaut/gradle/MicronautDeprecationsPluginSpec.groovy +++ b/minimal-plugin/src/test/groovy/io/micronaut/gradle/MicronautDeprecationsPluginSpec.groovy @@ -38,7 +38,7 @@ class MicronautDeprecationsPluginSpec extends AbstractGradleBuildSpec { def task = result.task(":assemble") then: - result.output.contains("Source set 'custom' was declared using the additionalSourcesets property. Please use sourceSet(...) instead.\n") + result.output.contains("Source set 'custom' was declared using the additionalSourcesets property. Please use sourceSet(...) instead.") task.outcome == TaskOutcome.SUCCESS } @@ -76,7 +76,7 @@ class MicronautDeprecationsPluginSpec extends AbstractGradleBuildSpec { def task = result.task(":assemble") then: - !result.output.contains("Source set 'custom' was declared using the additionalSourcesets property. Please use sourceSet(...) instead.\n") + !result.output.contains("Source set 'custom' was declared using the additionalSourcesets property. Please use sourceSet(...) instead.") task.outcome == TaskOutcome.SUCCESS } } diff --git a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/LenientVersionCatalogParser.java b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/LenientVersionCatalogParser.java index 675f8b28..320b88e8 100644 --- a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/LenientVersionCatalogParser.java +++ b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/LenientVersionCatalogParser.java @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import java.util.stream.Collectors; /** * A version catalog parser which is tolerant to errors and @@ -73,7 +72,7 @@ private void parseLibraries(@Nullable TomlTable librariesTable, RichVersionParse List keys = librariesTable.keySet() .stream() .sorted(Comparator.comparing(String::length)) - .collect(Collectors.toList()); + .toList(); for (String alias : keys) { parseLibrary(alias, librariesTable, strictVersionParser); } @@ -86,7 +85,7 @@ private void parseVersions(@Nullable TomlTable versionsTable, RichVersionParser List keys = versionsTable.keySet() .stream() .sorted(Comparator.comparing(String::length)) - .collect(Collectors.toList()); + .toList(); for (String alias : keys) { parseVersion(alias, versionsTable, strictVersionParser); } @@ -152,8 +151,7 @@ private void parseLibrary(String alias, TomlTable librariesTable, RichVersionPar String require = (String) version; RichVersion richVersion = strictVersionParser.parse(require); versionModel = new VersionModel(null, richVersion, position); - } else if (version instanceof TomlTable) { - TomlTable versionTable = (TomlTable) version; + } else if (version instanceof TomlTable versionTable) { String versionRef = versionTable.getString("ref"); String require = versionTable.getString("require"); String prefer = versionTable.getString("prefer"); @@ -161,7 +159,7 @@ private void parseLibrary(String alias, TomlTable librariesTable, RichVersionPar TomlArray rejectedArray = expectArray(versionTable, "reject"); List rejectedVersions = rejectedArray != null ? rejectedArray.toList().stream() .map(String::valueOf) - .collect(Collectors.toList()) : null; + .toList() : null; Boolean rejectAll = expectBoolean(versionTable, "rejectAll"); versionModel = new VersionModel(versionRef, versionRef == null ? new RichVersion( require, @@ -188,15 +186,14 @@ private void parseVersion(String alias, TomlTable versionsTable, RichVersionPars require = (String) version; RichVersion richVersion = strictVersionParser.parse(require); model.addVersion(new VersionModel(alias, richVersion, position)); - } else if (version instanceof TomlTable) { - TomlTable versionTable = (TomlTable) version; + } else if (version instanceof TomlTable versionTable) { require = versionTable.getString("require"); prefer = versionTable.getString("prefer"); strictly = versionTable.getString("strictly"); TomlArray rejectedArray = expectArray(versionTable, "reject"); rejectedVersions = rejectedArray != null ? rejectedArray.toList().stream() .map(String::valueOf) - .collect(Collectors.toList()) : null; + .toList() : null; rejectAll = expectBoolean(versionTable, "rejectAll"); model.addVersion(new VersionModel(alias, new RichVersion( require, diff --git a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/RichVersion.java b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/RichVersion.java index 8047e99b..c0296b06 100644 --- a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/RichVersion.java +++ b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/RichVersion.java @@ -17,6 +17,7 @@ import javax.annotation.Nullable; import java.util.List; +import java.util.Objects; public class RichVersion { public static final RichVersion EMPTY = new RichVersion(null, null, null, null, false); @@ -77,16 +78,16 @@ public boolean equals(Object o) { if (rejectAll != that.rejectAll) { return false; } - if (require != null ? !require.equals(that.require) : that.require != null) { + if (!Objects.equals(require, that.require)) { return false; } - if (strictly != null ? !strictly.equals(that.strictly) : that.strictly != null) { + if (!Objects.equals(strictly, that.strictly)) { return false; } - if (prefer != null ? !prefer.equals(that.prefer) : that.prefer != null) { + if (!Objects.equals(prefer, that.prefer)) { return false; } - return rejectedVersions != null ? rejectedVersions.equals(that.rejectedVersions) : that.rejectedVersions == null; + return Objects.equals(rejectedVersions, that.rejectedVersions); } @Override diff --git a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/VersionModel.java b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/VersionModel.java index 262ae8e9..0ce65e37 100644 --- a/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/VersionModel.java +++ b/platform-catalog-plugin/src/main/java/io/micronaut/gradle/catalog/VersionModel.java @@ -15,6 +15,8 @@ */ package io.micronaut.gradle.catalog; +import java.util.Objects; + import org.tomlj.TomlPosition; import javax.annotation.Nullable; @@ -55,10 +57,10 @@ public boolean equals(Object o) { VersionModel that = (VersionModel) o; - if (reference != null ? !reference.equals(that.reference) : that.reference != null) { + if (!Objects.equals(reference, that.reference)) { return false; } - return version != null ? version.equals(that.version) : that.version == null; + return Objects.equals(version, that.version); } @Override diff --git a/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesConsumerPlugin.java b/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesConsumerPlugin.java index 98a65a0d..06f88ad3 100644 --- a/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesConsumerPlugin.java +++ b/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesConsumerPlugin.java @@ -69,8 +69,7 @@ private Configuration createTestResourcesExtension(Project project) { conf.setCanBeResolved(false); conf.setDescription("Used to declare projects which provide test resources"); conf.getDependencies().whenObjectAdded(dep -> { - if (dep instanceof ProjectDependency) { - ProjectDependency projectDependency = (ProjectDependency) dep; + if (dep instanceof ProjectDependency projectDependency) { projectDependency.attributes(attrs -> configureUsageAttribute(project, attrs)); } else { throw new InvalidUserDataException("The test resources configuration can only contain project dependencies"); diff --git a/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesPlugin.java b/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesPlugin.java index 5d3e7a8e..0bd6f98e 100644 --- a/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesPlugin.java +++ b/test-resources-plugin/src/main/java/io/micronaut/gradle/testresources/MicronautTestResourcesPlugin.java @@ -327,7 +327,7 @@ private static void assertMinimalVersion(String testedVersion) { static ArrayList parseVersion(String testedVersion) { String version = testedVersion; - var index = version.indexOf("-"); + var index = version.indexOf('-'); if (index > 0) { version = version.substring(0, index); } @@ -354,7 +354,9 @@ private void configureServiceReset(ProjectInternal project, public void beforeComplete() { try { if (Files.exists(shouldStopFile)) { - project.getLogger().debug("Stop file contains " + Files.readAllLines(shouldStopFile)); + if (project.getLogger().isDebugEnabled()) { + project.getLogger().debug("Stop file contains {}", Files.readAllLines(shouldStopFile)); + } if (Boolean.parseBoolean(Files.readAllLines(shouldStopFile).get(0))) { ServerUtils.stopServer(settingsDirectory.get().getAsFile().toPath()); }