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

Micronaut: Avoid using jakarta.persistence when generating entity classes #6409

Merged
merged 1 commit into from
Sep 6, 2023
Merged

Micronaut: Avoid using jakarta.persistence when generating entity classes #6409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 10 additions & 17 deletions enterprise/micronaut/src/org/netbeans/modules/micronaut/db/MicronautEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ private void doGenerateBeans(ProgressPanel progressPanel, RelatedCMPHelper helpe
}

final boolean jpaSupported = Utils.isJPASupported(helper.getLocation());
final boolean jakartaSupported = Utils.isJakartaSupported(helper.getLocation());
final boolean beanValidationSupported = isBeanValidationSupported(helper.getLocation());

EntityClass[] entityClasses = helper.getBeans();
Expand All @@ -251,9 +250,6 @@ private void doGenerateBeans(ProgressPanel progressPanel, RelatedCMPHelper helpe

for (int i = 0; i < entityClasses.length; i++) {
final EntityClass entityClass = entityClasses[i];
if (entityClass.isForTable() && !entityClass.isUsePkField() && !jpaSupported && !jakartaSupported) {
throw new IOException("Cannot generate " + entityClass.getClassName() + " class unless 'jakarta.persistence' or 'javax.persistence' is on the project classpath. Update the classpath and invoke again.");
}
String entityClassName = entityClass.getClassName();
FileObject packageFileObject = entityClass.getPackageFileObject();
beanMap.put(entityClassName, entityClass);
Expand Down Expand Up @@ -365,10 +361,10 @@ private void doGenerateBeans(ProgressPanel progressPanel, RelatedCMPHelper helpe
: JavaSource.create(cpHelper.createClasspathInfo(), entityClassFO);
javaSource.runModificationTask(copy -> {
if (copy.getFileObject().equals(entityClassFO)) {
new EntityClassGenerator(copy, entityClass, jpaSupported, jakartaSupported, beanValidationSupported).run();
new EntityClassGenerator(copy, entityClass, jpaSupported, beanValidationSupported).run();
} else {
if (entityClass.getUpdateType() != UpdateType.UPDATE) {
new PKClassGenerator(copy, entityClass, jpaSupported, jakartaSupported, beanValidationSupported).run();
new PKClassGenerator(copy, entityClass, jpaSupported, beanValidationSupported).run();
} else {
Logger.getLogger(Generator.class.getName()).log(Level.INFO, "PK Class update isn't supported"); //NOI18N
}
Expand Down Expand Up @@ -463,10 +459,9 @@ private abstract class ClassGenerator {
protected ModuleElement moduleElement;

protected final boolean generateJPA;
protected final boolean jakartaSupported;
protected final boolean generateValidationConstraints;

private ClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean jakartaSupported, boolean beanValidationSupported) throws IOException {
private ClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean beanValidationSupported) throws IOException {
copy.toPhase(JavaSource.Phase.RESOLVED);
this.copy = copy;
this.entityClass = entityClass;
Expand All @@ -486,7 +481,6 @@ private ClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSup
newClassTree = originalClassTree;
genUtils = GenerationUtils.newInstance(copy);
generateJPA = jpaSupported;
this.jakartaSupported = jakartaSupported;
generateValidationConstraints = beanValidationSupported;
}

Expand Down Expand Up @@ -539,7 +533,7 @@ protected Property createProperty(EntityMember m) throws IOException {

String columnName = dbMappings.getCMPFieldMapping().get(memberName);
if (!memberName.equalsIgnoreCase(columnName)){
columnAnnArguments.add(genUtils.createAnnotationArgument("name", columnName)); //NOI18N
columnAnnArguments.add(genUtils.createAnnotationArgument(generateJPA ? "name" : null, columnName)); //NOI18N
}

Integer length = m.getLength();
Expand All @@ -557,9 +551,8 @@ protected Property createProperty(EntityMember m) throws IOException {
if (!columnAnnArguments.isEmpty()) {
if (generateJPA) {
annotations.add(genUtils.createAnnotation("javax.persistence.Column", columnAnnArguments)); //NOI18N
}
if (isPKMember && needsPKClass && jakartaSupported) {
annotations.add(genUtils.createAnnotation("jakarta.persistence.Column", columnAnnArguments)); //NOI18N
} else if (isPKMember && needsPKClass) {
annotations.add(genUtils.createAnnotation("io.micronaut.data.annotation.MappedProperty", columnAnnArguments)); //NOI18N
}
}

Expand Down Expand Up @@ -723,8 +716,8 @@ private class EntityClassGenerator extends ClassGenerator {
private Property pkProperty;
private boolean pkGenerated;

public EntityClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean jakartaSupported, boolean beanValidationSupported) throws IOException {
super(copy, entityClass, jpaSupported, jakartaSupported, beanValidationSupported);
public EntityClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean beanValidationSupported) throws IOException {
super(copy, entityClass, jpaSupported, beanValidationSupported);
entityClassName = getClassName(entityClass);
assert typeElement.getSimpleName().contentEquals(entityClassName);
}
Expand Down Expand Up @@ -965,8 +958,8 @@ private void makeReadOnlyIfNecessary(List<String> pkColumnNames, String testColu

private final class PKClassGenerator extends ClassGenerator {

public PKClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean jakartaSupported, boolean beanValidationSupported) throws IOException {
super(copy, entityClass, jpaSupported, jakartaSupported, beanValidationSupported);
public PKClassGenerator(WorkingCopy copy, EntityClass entityClass, boolean jpaSupported, boolean beanValidationSupported) throws IOException {
super(copy, entityClass, jpaSupported, beanValidationSupported);
}

@Override
Expand Down
12 changes: 0 additions & 12 deletions enterprise/micronaut/src/org/netbeans/modules/micronaut/db/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,4 @@ public static boolean isJPASupported(SourceGroup sg) {
final String notNullAnnotation = "io.micronaut.data.jpa.repository.JpaRepository"; //NOI18N
return compile.findResource(notNullAnnotation.replace('.', '/') + ".class") != null; //NOI18N
}

public static boolean isJakartaSupported(SourceGroup sg) {
if (sg == null) {
return false;
}
ClassPath compile = ClassPath.getClassPath(sg.getRootFolder(), ClassPath.COMPILE);
if (compile == null) {
return false;
}
final String notNullAnnotation = "jakarta.persistence.Persistence"; //NOI18N
return compile.findResource(notNullAnnotation.replace('.', '/') + ".class") != null; //NOI18N
}
}
Loading