Exclude Groovy autogenerated MAX_VALUE and MIN_VALUE from enum (#6763)

Fixes #6760
micronaut-projects · Jan 21, 2022 · a14c80f · a14c80f
1 parent 59c59d6
commit a14c80f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyEnumElement.java b/inject-groovy/src/main/groovy/io/micronaut/ast/groovy/visitor/GroovyEnumElement.java
@@ -55,7 +55,11 @@ class GroovyEnumElement extends GroovyClassElement implements EnumElement {
     @Override
     public List<String> values() {
         ClassNode cn = (ClassNode) getNativeType();
-        List<String> values = cn.getFields().stream().filter(fn -> fn.getType().equals(cn)).map(FieldNode::getName).collect(Collectors.toList());
+        List<String> values = cn.getFields().stream()
+                .filter((fn -> !fn.getName().equals("MAX_VALUE") && !fn.getName().equals("MIN_VALUE")))
+                .filter(fn -> fn.getType().equals(cn))
+                .map(FieldNode::getName)
+                .collect(Collectors.toList());
         return Collections.unmodifiableList(values);
     }
 

diff --git a/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/visitor/GroovyEnumElementSpec.groovy b/inject-groovy/src/test/groovy/io/micronaut/ast/groovy/visitor/GroovyEnumElementSpec.groovy
@@ -35,4 +35,18 @@ class Foo {
         expect:
         element.getEnclosedElement(ElementQuery.of(ClassElement.class)).get().getPrimaryConstructor().get().getDeclaringType().isEnum()
     }
+
+    void "exclude Groovy autogenerated MAX_VALUE and MIN_VALUE"() {
+        given:
+        def element = (GroovyEnumElement) buildClassElement("""
+package test
+
+enum MyEnum {
+    A, B
+}
+""")
+        expect:
+        !element.values().contains('MAX_VALUE')
+        !element.values().contains('MIN_VALUE')
+    }
 }