fix: remove redundant lombok.Setter and lombok.experimental.Accessors…

… annotations Signed-off-by: Marc Nuri <[email protected]>
fabric8io · Nov 2, 2023 · b4c783f · b4c783f
1 parent ec1bb71
commit b4c783f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,9 @@
 ### 6.10-SNAPSHOT
 
 #### Bugs
+* Fix #5560: bump com.marcnuri.plugins:gradle-api-maven-plugin to v0.0.5, allows compilation behind a proxy
+* Fix #5564: remove redundant lombok.Setter and lombok.experimental.Accessors annotations
+* Fix #5565: bump sundrio to 0.101.3 to fix Visitor problems
 
 #### Improvements
 

diff --git a/...generator/core/src/main/java/io/fabric8/java/generator/nodes/JObjectExtraAnnotations.java b/...generator/core/src/main/java/io/fabric8/java/generator/nodes/JObjectExtraAnnotations.java
@@ -31,12 +31,6 @@ default void addExtraAnnotations(ClassOrInterfaceDeclaration clz) {
           new Name("lombok.EqualsAndHashCode"),
           new NameExpr("callSuper = true")));
     }
-    clz.addAnnotation("lombok.Setter");
-
-    clz.addAnnotation(
-        new SingleMemberAnnotationExpr(
-            new Name("lombok.experimental.Accessors"),
-            new NameExpr("prefix = {\n" + "    \"_\",\n" + "    \"\"\n" + "}")));
 
     clz.addAnnotation(
         new SingleMemberAnnotationExpr(

diff --git a/...est.generate_withValidCrd_shouldGeneratePojos.testCrontabExtraAnnotationsCrd.approved.txt b/...est.generate_withValidCrd_shouldGeneratePojos.testCrontabExtraAnnotationsCrd.approved.txt
@@ -7,11 +7,6 @@ CrontabJavaExtraAnnotationsCr[0] = package org.test.v1;
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 @lombok.ToString()
 @lombok.EqualsAndHashCode(callSuper = true)
-@lombok.Setter()
-@lombok.experimental.Accessors(prefix = {
-    "_",
-    ""
-})
 @io.sundr.builder.annotations.Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
@@ -33,11 +28,6 @@ CrontabJavaExtraAnnotationsCr[1] = package org.test.v1;
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 @lombok.ToString()
 @lombok.EqualsAndHashCode()
-@lombok.Setter()
-@lombok.experimental.Accessors(prefix = {
-    "_",
-    ""
-})
 @io.sundr.builder.annotations.Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),
@@ -109,11 +99,6 @@ CrontabJavaExtraAnnotationsCr[2] = package org.test.v1;
 @javax.annotation.processing.Generated("io.fabric8.java.generator.CRGeneratorRunner")
 @lombok.ToString()
 @lombok.EqualsAndHashCode()
-@lombok.Setter()
-@lombok.experimental.Accessors(prefix = {
-    "_",
-    ""
-})
 @io.sundr.builder.annotations.Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),

diff --git a/java-generator/it/src/it/cert-manager/expected/Auth.expected b/java-generator/it/src/it/cert-manager/expected/Auth.expected
@@ -5,11 +5,6 @@ package io.cert_manager.v1.issuerspec.vault;
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
 @lombok.ToString()
 @lombok.EqualsAndHashCode()
-@lombok.Setter()
-@lombok.experimental.Accessors(prefix = {
-    "_",
-    ""
-})
 @io.sundr.builder.annotations.Buildable(editableEnabled = false, validationEnabled = false, generateBuilderPackage = false, builderPackage = "io.fabric8.kubernetes.api.builder", refs = {
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectMeta.class),
     @io.sundr.builder.annotations.BuildableReference(io.fabric8.kubernetes.api.model.ObjectReference.class),

diff --git a/...r/it/src/it/cert-manager/pom.xml.disabled → ...-generator/it/src/it/cert-manager/pom.xml b/...r/it/src/it/cert-manager/pom.xml.disabled → ...-generator/it/src/it/cert-manager/pom.xml