Skip to content

Commit 7f34842

Browse files
committed
minor items
1 parent b8d64b4 commit 7f34842

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

src/main/java/org/codehaus/groovy/ast/AnnotationNode.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,17 +245,17 @@ private static String getText(final Expression e) {
245245
}
246246

247247
public static String targetToName(final int target) {
248+
if ((target & 1) == 1) return "TYPE"; // GROOVY-7151
248249
return switch (target) {
249-
case TYPE_TARGET -> "TYPE";
250-
case CONSTRUCTOR_TARGET -> "CONSTRUCTOR";
251-
case METHOD_TARGET -> "METHOD";
252-
case FIELD_TARGET -> "FIELD";
253-
case PARAMETER_TARGET -> "PARAMETER";
254-
case LOCAL_VARIABLE_TARGET -> "LOCAL_VARIABLE";
255-
case ANNOTATION_TARGET -> "ANNOTATION";
256-
case PACKAGE_TARGET -> "PACKAGE";
257-
case TYPE_PARAMETER_TARGET -> "TYPE_PARAMETER";
258-
case TYPE_USE_TARGET -> "TYPE_USE";
250+
case CONSTRUCTOR_TARGET -> "CONSTRUCTOR";
251+
case METHOD_TARGET -> "METHOD";
252+
case FIELD_TARGET -> "FIELD";
253+
case PARAMETER_TARGET -> "PARAMETER";
254+
case LOCAL_VARIABLE_TARGET -> "LOCAL_VARIABLE";
255+
case ANNOTATION_TARGET -> "ANNOTATION";
256+
case PACKAGE_TARGET -> "PACKAGE";
257+
case TYPE_PARAMETER_TARGET -> "TYPE_PARAMETER";
258+
case TYPE_USE_TARGET -> "TYPE_USE";
259259
case RECORD_COMPONENT_TARGET -> "RECORD_COMPONENT";
260260
default -> "unknown target";
261261
};

subprojects/groovy-contracts/src/main/java/org/apache/groovy/contracts/ast/visitor/AnnotationProcessorVisitor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@ private void handleMethodAnnotation(MethodNode methodNode, AnnotationNode annota
199199
if (!AnnotationUtils.hasAnnotationOfType(methodNode, annotationNode.getClassNode().getName())) {
200200
AnnotationNode markerAnnotation = new AnnotationNode(annotationNode.getClassNode());
201201
replaceCondition(markerAnnotation, valueExpression);
202-
markerAnnotation.setRuntimeRetention(true);
203-
markerAnnotation.setSourceRetention(false);
204202
methodNode.addAnnotation(markerAnnotation);
205203
}
206204
}

0 commit comments

Comments
 (0)