This is an automated email from the ASF dual-hosted git repository.
mariofusco pushed a commit to branch quarkus3
in repository https://gitbox.apache.org/repos/asf/incubator-kie-drools.git
The following commit(s) were added to refs/heads/quarkus3 by this push:
new 4f3ea90109 wip
4f3ea90109 is described below
commit 4f3ea90109059173cd8cfdaef8ec1fdd8f5b2852
Author: mariofusco <[email protected]>
AuthorDate: Wed Nov 22 15:30:02 2023 +0100
wip
---
.../codegen/common/di/DependencyInjectionAnnotator.java | 8 ++++----
.../common/di/impl/CDIDependencyInjectionAnnotator.java | 16 ++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
index e31288ebea..133e55e433 100644
---
a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
+++
b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/DependencyInjectionAnnotator.java
@@ -18,6 +18,9 @@
*/
package org.drools.codegen.common.di;
+import java.util.ArrayList;
+import java.util.List;
+
import com.github.javaparser.ast.NodeList;
import com.github.javaparser.ast.expr.ArrayInitializerExpr;
import com.github.javaparser.ast.expr.Expression;
@@ -29,9 +32,6 @@ import
com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
import com.github.javaparser.ast.expr.StringLiteralExpr;
import com.github.javaparser.ast.nodeTypes.NodeWithAnnotations;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Generic abstraction for dependency injection annotations that allow to
* use different frameworks based needs.
@@ -183,7 +183,7 @@ public interface DependencyInjectionAnnotator {
rolesExpr.add(new StringLiteralExpr(role.trim()));
}
- node.addAnnotation(new SingleMemberAnnotationExpr(new
Name("javax.annotation.security.RolesAllowed"), new
ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
+ node.addAnnotation(new SingleMemberAnnotationExpr(new
Name("jakarta.annotation.security.RolesAllowed"), new
ArrayInitializerExpr(NodeList.nodeList(rolesExpr))));
}
return node;
}
diff --git
a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
index 47e33bd14c..0631364e81 100644
---
a/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
+++
b/drools-model/drools-codegen-common/src/main/java/org/drools/codegen/common/di/impl/CDIDependencyInjectionAnnotator.java
@@ -36,7 +36,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withProduces(T node, boolean
isDefault) {
- node.addAndGetAnnotation("javax.enterprise.inject.Produces");
+ node.addAndGetAnnotation("jakarta.enterprise.inject.Produces");
if (isDefault) {
node.addAndGetAnnotation("io.quarkus.arc.DefaultBean");
}
@@ -45,13 +45,13 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withNamed(T node, String name)
{
- node.addAnnotation(new SingleMemberAnnotationExpr(new
Name("javax.inject.Named"), new StringLiteralExpr(name)));
+ node.addAnnotation(new SingleMemberAnnotationExpr(new
Name("jakarta.inject.Named"), new StringLiteralExpr(name)));
return node;
}
@Override
public <T extends NodeWithAnnotations<?>> T withApplicationComponent(T
node) {
- node.addAnnotation("javax.enterprise.context.ApplicationScoped");
+ node.addAnnotation("jakarta.enterprise.context.ApplicationScoped");
return node;
}
@@ -62,7 +62,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withSingletonComponent(T node)
{
- node.addAnnotation("javax.inject.Singleton");
+ node.addAnnotation("jakarta.inject.Singleton");
return node;
}
@@ -73,7 +73,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withInjection(T node, boolean
lazy) {
- node.addAnnotation("javax.inject.Inject");
+ node.addAnnotation("jakarta.inject.Inject");
return node;
}
@@ -107,7 +107,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public String optionalInstanceInjectionType() {
- return "javax.enterprise.inject.Instance";
+ return "jakarta.enterprise.inject.Instance";
}
@Override
@@ -134,7 +134,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public String applicationComponentType() {
- return "javax.enterprise.context.ApplicationScoped";
+ return "jakarta.enterprise.context.ApplicationScoped";
}
@Override
@@ -174,7 +174,7 @@ public class CDIDependencyInjectionAnnotator implements
DependencyInjectionAnnot
@Override
public <T extends NodeWithAnnotations<?>> T withFactoryMethod(T node) {
- node.addAnnotation("javax.enterprise.inject.Produces");
+ node.addAnnotation("jakarta.enterprise.inject.Produces");
return node;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
