Skip to content

Commit

Permalink
Add display name and some polish
Browse files Browse the repository at this point in the history
  • Loading branch information
@pway99
pway99 committed Sep 13, 2022
1 parent 5e549e4 commit a0befe7
Showing 1 changed file with 57 additions and 49 deletions.
106 changes: 57 additions & 49 deletions src/main/java/org/openrewrite/java/spring/boot3/PreciseBeanType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@ public class PreciseBeanType extends Recipe {

@Override
public String getDisplayName() {
return "Bean methods should return concrete types";
}

@Override
public String getDescription() {
return "Replace Bean method return types with concrete types being returned. This is required for Spring 6 AOT";
}

@Override
protected TreeVisitor<?, ExecutionContext> getSingleSourceApplicableTest() {
return new UsesType<ExecutionContext>(BEAN);
protected UsesType<ExecutionContext> getSingleSourceApplicableTest() {
return new UsesType<>(BEAN);
}

@Override
Expand All @@ -47,66 +52,69 @@ protected TreeVisitor<?, ExecutionContext> getVisitor() {
@Override
public J.MethodDeclaration visitMethodDeclaration(J.MethodDeclaration method, ExecutionContext executionContext) {
J.MethodDeclaration m = super.visitMethodDeclaration(method, executionContext);
if (isBeanMethod(m)) {
Object o = getCursor().pollMessage(MSG_KEY);
if (o != null) {
if (!o.equals(method.getReturnTypeExpression().getType())) {
if (o instanceof JavaType.FullyQualified) {
JavaType.FullyQualified actualType = (JavaType.FullyQualified) o;
if (m.getReturnTypeExpression() instanceof J.Identifier) {
J.Identifier identifierReturnExpr = (J.Identifier) m.getReturnTypeExpression();
maybeAddImport(actualType);
if (identifierReturnExpr.getType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) identifierReturnExpr.getType());
}
m = m.withReturnTypeExpression(identifierReturnExpr
.withType(actualType)
.withSimpleName(actualType.getClassName())
);
} else if (m.getReturnTypeExpression() instanceof J.ParameterizedType) {
J.ParameterizedType parameterizedType = (J.ParameterizedType) m.getReturnTypeExpression();
maybeAddImport(actualType);
if (parameterizedType.getType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) parameterizedType.getType());
}
m = m.withReturnTypeExpression(parameterizedType
.withType(actualType)
.withClazz(TypeTree.build(actualType.getClassName()).withType(actualType))
);
}
Object o = getCursor().pollMessage(MSG_KEY);
if (o != null && (method.getReturnTypeExpression() != null && !o.equals(method.getReturnTypeExpression().getType())) && isBeanMethod(m)) {
if (o instanceof JavaType.FullyQualified) {
JavaType.FullyQualified actualType = (JavaType.FullyQualified) o;
if (m.getReturnTypeExpression() instanceof J.Identifier) {
J.Identifier identifierReturnExpr = (J.Identifier) m.getReturnTypeExpression();
maybeAddImport(actualType);
if (identifierReturnExpr.getType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) identifierReturnExpr.getType());
}
m = m.withReturnTypeExpression(identifierReturnExpr
.withType(actualType)
.withSimpleName(actualType.getClassName())
);
} else if (m.getReturnTypeExpression() instanceof J.ParameterizedType) {
J.ParameterizedType parameterizedType = (J.ParameterizedType) m.getReturnTypeExpression();
maybeAddImport(actualType);
if (parameterizedType.getType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) parameterizedType.getType());
}
m = m.withReturnTypeExpression(parameterizedType
.withType(actualType)
.withClazz(TypeTree.build(actualType.getClassName()).withType(actualType))
);
}

} else if (o instanceof JavaType.Array) {
JavaType.Array actualType = (JavaType.Array) o;
if (m.getReturnTypeExpression() instanceof J.ArrayType && actualType.getElemType() instanceof JavaType.FullyQualified) {
JavaType.FullyQualified actualElementType = (JavaType.FullyQualified) actualType.getElemType();
J.ArrayType arrayType = (J.ArrayType) m.getReturnTypeExpression();
maybeAddImport(actualElementType);
if (arrayType.getElementType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) arrayType.getElementType());
}
m = m.withReturnTypeExpression(arrayType
.withElementType(TypeTree.build(actualElementType.getClassName()).withType(actualType))
);
}
} else if (o instanceof JavaType.Array) {
JavaType.Array actualType = (JavaType.Array) o;
if (m.getReturnTypeExpression() instanceof J.ArrayType && actualType.getElemType() instanceof JavaType.FullyQualified) {
JavaType.FullyQualified actualElementType = (JavaType.FullyQualified) actualType.getElemType();
J.ArrayType arrayType = (J.ArrayType) m.getReturnTypeExpression();
maybeAddImport(actualElementType);
if (arrayType.getElementType() instanceof JavaType.FullyQualified) {
maybeRemoveImport((JavaType.FullyQualified) arrayType.getElementType());
}
m = m.withReturnTypeExpression(arrayType
.withElementType(TypeTree.build(actualElementType.getClassName()).withType(actualType))
);
}
}
}
return m;
}

private boolean isBeanMethod(J.MethodDeclaration m) {
return m.getLeadingAnnotations().stream().anyMatch(a -> TypeUtils.isOfClassType(a.getType(), BEAN));
for (J.Annotation leadingAnnotation : m.getLeadingAnnotations()) {
if (TypeUtils.isOfClassType(leadingAnnotation.getType(), BEAN)) {
return true;
}
}
return false;
}

@Override
public J.Return visitReturn(J.Return _return, ExecutionContext executionContext) {
Cursor methodCursor = getCursor();
while (methodCursor != null && !(methodCursor.getValue() instanceof J.Lambda || methodCursor.getValue() instanceof J.MethodDeclaration)) {
methodCursor = methodCursor.getParent();
}
if (methodCursor != null && methodCursor.getValue() instanceof J.MethodDeclaration) {
methodCursor.putMessage(MSG_KEY, _return.getExpression().getType());
if (_return.getExpression() != null && _return.getExpression().getType() != null) {
Cursor methodCursor = getCursor();
while (methodCursor != null && !(methodCursor.getValue() instanceof J.Lambda || methodCursor.getValue() instanceof J.MethodDeclaration)) {
methodCursor = methodCursor.getParent();
}
if (methodCursor != null && methodCursor.getValue() instanceof J.MethodDeclaration) {
methodCursor.putMessage(MSG_KEY, _return.getExpression().getType());
}
}
return super.visitReturn(_return, executionContext);
}
Expand Down

0 comments on commit a0befe7

Please sign in to comment.