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.

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

Add missing annotation processors for micronaut modules. #872

Merged
merged 2 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,25 @@ public abstract class PluginsHelper {
public static final ConfigurableVersionProperty CORE_VERSION_PROPERTY = ConfigurableVersionProperty.of("core");
public static final ConfigurableVersionProperty DATA_VERSION_PROPERTY = ConfigurableVersionProperty.of("data");
public static final ConfigurableVersionProperty JAXRS_VERSION_PROPERTY = ConfigurableVersionProperty.of("jaxrs");
public static final ConfigurableVersionProperty MICROMETER_VERSION_PROPERTY = ConfigurableVersionProperty.of("micrometer");
public static final ConfigurableVersionProperty MICROSTREAM_VERSION_PROPERTY = ConfigurableVersionProperty.of("microstream");
public static final ConfigurableVersionProperty OPENAPI_VERSION_PROPERTY = ConfigurableVersionProperty.of("openapi");
public static final ConfigurableVersionProperty SECURITY_VERSION_PROPERTY = ConfigurableVersionProperty.of("security");
public static final ConfigurableVersionProperty SERDE_VERSION_PROPERTY = ConfigurableVersionProperty.of("serde");
public static final ConfigurableVersionProperty SPRING_VERSION_PROPERTY = ConfigurableVersionProperty.of("spring");
public static final ConfigurableVersionProperty TRACING_VERSION_PROPERTY = ConfigurableVersionProperty.of("tracing");
public static final ConfigurableVersionProperty VALIDATION_VERSION_PROPERTY = ConfigurableVersionProperty.of("validation");

private static final Map<String, AutomaticDependency> GROUP_TO_PROCESSOR_MAP = Map.of(
"io.micronaut.data", new AutomaticDependency(null, "io.micronaut.data:micronaut-data-processor", Optional.of(DATA_VERSION_PROPERTY)),
"io.micronaut.jaxrs", new AutomaticDependency(null, "io.micronaut.jaxrs:micronaut-jaxrs-processor", Optional.of(JAXRS_VERSION_PROPERTY)),
"io.micronaut.micrometer", new AutomaticDependency(null, "io.micronaut.micrometer:micronaut-micrometer-annotation", Optional.of(MICROMETER_VERSION_PROPERTY)),
"io.micronaut.microstream", new AutomaticDependency(null, "io.micronaut.microstream:micronaut-microstream-annotations", Optional.of(MICROSTREAM_VERSION_PROPERTY)),
"io.micronaut.openapi", new AutomaticDependency(null, "io.micronaut.openapi:micronaut-openapi", Optional.of(OPENAPI_VERSION_PROPERTY)),
"io.micronaut.security", new AutomaticDependency(null, "io.micronaut.security:micronaut-security-annotations", Optional.of(SECURITY_VERSION_PROPERTY)),
"io.micronaut.serde", new AutomaticDependency(null, "io.micronaut.serde:micronaut-serde-processor", Optional.of(SERDE_VERSION_PROPERTY)),
"io.micronaut.spring", new AutomaticDependency(null, "io.micronaut.spring:micronaut-spring-annotation", Optional.of(SPRING_VERSION_PROPERTY)),
"io.micronaut.tracing", new AutomaticDependency(null, "io.micronaut.tracing:micronaut-tracing-annotation", Optional.of(TRACING_VERSION_PROPERTY)),
"io.micronaut.validation", new AutomaticDependency(null, "io.micronaut.validation:micronaut-validation-processor", Optional.of(VALIDATION_VERSION_PROPERTY))
);
public static final String MICRONAUT_VERSION_PROPERTY = "micronautVersion";
Expand All @@ -68,7 +80,13 @@ public abstract class PluginsHelper {
CORE_VERSION_PROPERTY,
DATA_VERSION_PROPERTY,
JAXRS_VERSION_PROPERTY,
MICROMETER_VERSION_PROPERTY,
MICROSTREAM_VERSION_PROPERTY,
OPENAPI_VERSION_PROPERTY,
SECURITY_VERSION_PROPERTY,
SERDE_VERSION_PROPERTY,
SPRING_VERSION_PROPERTY,
TRACING_VERSION_PROPERTY,
VALIDATION_VERSION_PROPERTY
);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package io.micronaut.gradle


import org.gradle.testfixtures.ProjectBuilder
import spock.lang.Specification

class AutomaticDependencySpec extends Specification {
def "automatically adds annotation processor dependency for #group"() {
def project = ProjectBuilder.builder().build()
project.extensions.add('micronautVersion', 'any')
project.pluginManager.apply(MicronautMinimalLibraryPlugin)

when:
project.configurations.implementation.dependencies.add(project.dependencies.create("$group:micronaut-any"))
project.evaluate()

// this variable is used to make sure other automatic dependencies are not used
// when a particular dependency is found
def shouldNotHave = "io.micronaut.validation:micronaut-validation-processor"
if (group == "io.micronaut.validation") {
shouldNotHave = "io.micronaut.data:micronaut-data-processor"
}

then:
project.configurations.annotationProcessor.incoming.dependencies.find { "${it.group}:${it.name}" == processor }
!project.configurations.annotationProcessor.incoming.dependencies.find { "${it.group}:${it.name}" == shouldNotHave }

where:
group | processor
"io.micronaut.data" | "io.micronaut.data:micronaut-data-processor"
"io.micronaut.jaxrs" | "io.micronaut.jaxrs:micronaut-jaxrs-processor"
"io.micronaut.micrometer" | "io.micronaut.micrometer:micronaut-micrometer-annotation"
"io.micronaut.microstream" | "io.micronaut.microstream:micronaut-microstream-annotations"
"io.micronaut.openapi" | "io.micronaut.openapi:micronaut-openapi"
"io.micronaut.security" | "io.micronaut.security:micronaut-security-annotations"
"io.micronaut.serde" | "io.micronaut.serde:micronaut-serde-processor"
"io.micronaut.spring" | "io.micronaut.spring:micronaut-spring-annotation"
"io.micronaut.tracing" | "io.micronaut.tracing:micronaut-tracing-annotation"
"io.micronaut.validation" | "io.micronaut.validation:micronaut-validation-processor"
}
}
Loading