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

Convert temporal types in the switch to Hibernate 6 #41

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Convert temporal types in the switch to Hibernate 6 #41

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
142 changes: 92 additions & 50 deletions src/main/java/org/openrewrite/hibernate/TypeAnnotationParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import org.openrewrite.internal.ListUtils;
import org.openrewrite.java.AnnotationMatcher;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.JavaParser;
import org.openrewrite.java.JavaTemplate;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.JLeftPadded;
import org.openrewrite.java.tree.JavaType;
Expand All @@ -34,6 +36,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;

public class TypeAnnotationParameter extends Recipe {

Expand Down Expand Up @@ -64,62 +67,101 @@ public String getDescription() {
public TreeVisitor<?, ExecutionContext> getVisitor() {
return new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
public J.@Nullable Annotation visitAnnotation(J.Annotation annotation, ExecutionContext ctx) {
J.Annotation a = super.visitAnnotation(annotation, ctx);
if (FQN_TYPE_ANNOTATION.matches(a)) {
// Remove entire annotation if type is one of the removed types
if (a.getArguments().stream().anyMatch(arg -> {
if (arg instanceof J.Assignment) {
J.Assignment assignment = (J.Assignment) arg;
if (assignment.getVariable() instanceof J.Identifier &&
"type".equals(((J.Identifier) assignment.getVariable()).getSimpleName()) &&
assignment.getAssignment() instanceof J.Literal) {
String fqTypeName = (String) ((J.Literal) assignment.getAssignment()).getValue();
return REMOVED_FQNS.contains(fqTypeName);
}
if (!FQN_TYPE_ANNOTATION.matches(a)) {
return a;
}

// Remove entire annotation if type is one of the removed types
if (a.getArguments().stream().anyMatch(arg -> {
if (arg instanceof J.Assignment) {
J.Assignment assignment = (J.Assignment) arg;
if (assignment.getVariable() instanceof J.Identifier &&
"type".equals(((J.Identifier) assignment.getVariable()).getSimpleName()) &&
assignment.getAssignment() instanceof J.Literal) {
String fqTypeName = (String) ((J.Literal) assignment.getAssignment()).getValue();
return REMOVED_FQNS.contains(fqTypeName);
}
}
return false;
})) {
maybeRemoveImport("org.hibernate.annotations.Type");
return null;
}

// Replace with Temporal if applicable
AtomicReference<String> temporalType = getTemporalTypeArgument(a);
//noinspection ConstantValue
if (temporalType.get() != null) {
maybeAddImport("jakarta.persistence.Temporal");
maybeAddImport("jakarta.persistence.TemporalType");
maybeRemoveImport("org.hibernate.annotations.Type");
return JavaTemplate.builder("@Temporal(TemporalType." + temporalType.get().toUpperCase() + ")")
.doBeforeParseTemplate(System.out::println)
.javaParser(JavaParser.fromJavaVersion().classpathFromResources(ctx, "jakarta.persistence-api"))
.imports("jakarta.persistence.Temporal", "jakarta.persistence.TemporalType")
.build()
.apply(getCursor(), a.getCoordinates().replace());
}

// Replace argument with .class reference to the same type
return replaceArgumentWithClass(a);
}

private AtomicReference<String> getTemporalTypeArgument(J.Annotation a) {
AtomicReference<String> temporalType = new AtomicReference<>();
new JavaIsoVisitor<AtomicReference<String>>() {
@Override
public J.Assignment visitAssignment(J.Assignment assignment, AtomicReference<String> ref) {
J.Assignment as = super.visitAssignment(assignment, ref);
if (J.Literal.isLiteralValue(as.getAssignment(), "date") ||
J.Literal.isLiteralValue(as.getAssignment(), "time") ||
J.Literal.isLiteralValue(as.getAssignment(), "timestamp")) {
//noinspection DataFlowIssue
ref.set((String) ((J.Literal) as.getAssignment()).getValue());
}
return false;
})) {
maybeRemoveImport("org.hibernate.annotations.Type");
return null;
return as;
}
}.visitNonNull(a, temporalType);
return temporalType;
}

final boolean isOnlyParameter = a.getArguments().size() == 1;
// Replace type parameter with value parameter
a = a.withArguments(ListUtils.map(a.getArguments(), arg -> {
if (arg instanceof J.Assignment) {
J.Assignment assignment = (J.Assignment) arg;
if (assignment.getVariable() instanceof J.Identifier &&
"type".equals(((J.Identifier) assignment.getVariable()).getSimpleName()) &&
assignment.getAssignment() instanceof J.Literal) {
String fqTypeName = (String) ((J.Literal) assignment.getAssignment()).getValue();
J.Identifier identifier = new J.Identifier(
Tree.randomId(),
Space.EMPTY,
Markers.EMPTY,
Collections.emptyList(),
getSimpleName(fqTypeName),
JavaType.buildType(fqTypeName),
null);
J.FieldAccess fa = new J.FieldAccess(
Tree.randomId(),
isOnlyParameter ? Space.EMPTY : assignment.getAssignment().getPrefix(),
assignment.getAssignment().getMarkers(),
identifier,
JLeftPadded.build(new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, Collections.emptyList(), "class", null, null)),
JavaType.buildType("java.lang.Class")
);
maybeAddImport(fqTypeName);
if (isOnlyParameter) {
return fa;
}
return assignment.withVariable(((J.Identifier) assignment.getVariable()).withSimpleName("value")).withAssignment(fa);
private J.Annotation replaceArgumentWithClass(J.Annotation a) {
final boolean isOnlyParameter = a.getArguments().size() == 1;
// Replace type parameter with value parameter
return a.withArguments(ListUtils.map(a.getArguments(), arg -> {
if (arg instanceof J.Assignment) {
J.Assignment assignment = (J.Assignment) arg;
if (assignment.getVariable() instanceof J.Identifier &&
"type".equals(((J.Identifier) assignment.getVariable()).getSimpleName()) &&
assignment.getAssignment() instanceof J.Literal) {
String fqTypeName = (String) ((J.Literal) assignment.getAssignment()).getValue();
J.Identifier identifier = new J.Identifier(
Tree.randomId(),
Space.EMPTY,
Markers.EMPTY,
Collections.emptyList(),
getSimpleName(fqTypeName),
JavaType.buildType(fqTypeName),
null);
J.FieldAccess fa = new J.FieldAccess(
Tree.randomId(),
isOnlyParameter ? Space.EMPTY : assignment.getAssignment().getPrefix(),
assignment.getAssignment().getMarkers(),
identifier,
JLeftPadded.build(new J.Identifier(Tree.randomId(), Space.EMPTY, Markers.EMPTY, Collections.emptyList(), "class", null, null)),
JavaType.buildType("java.lang.Class")
);
maybeAddImport(fqTypeName);
if (isOnlyParameter) {
return fa;
}
return assignment.withVariable(((J.Identifier) assignment.getVariable()).withSimpleName("value")).withAssignment(fa);
}
return arg;
}));
}
return a;
}
return arg;
}));
}
};
}
Expand Down
29 changes: 29 additions & 0 deletions src/test/java/org/openrewrite/hibernate/TypeAnnotationParameterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,33 @@ public class TestApplication {
)
);
}

@Test
void temporalTypesConvertedSeparately() {
rewriteRun(
//language=java
java(
"""
import java.util.Date;
import org.hibernate.annotations.Type;

public class TestApplication {
@Type(type = "timestamp")
Date a;
}
""",
"""
import java.util.Date;

import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;

public class TestApplication {
@Temporal(TemporalType.TIMESTAMP)
Date a;
}
"""
)
);
}
}