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

fix: remove redundant lombok.Setter and lombok.experimental.Accessors annotations #5566

Merged
merged 1 commit into from
Nov 2, 2023
Merged

fix: remove redundant lombok.Setter and lombok.experimental.Accessors annotations #5566

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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is normal that it covers other fixes?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I added the changelog for the rest of things that will go into 6.9.2.
I want to get started with the release ASAP


#### Improvements

Expand Down
6 changes: 0 additions & 6 deletions ...generator/core/src/main/java/io/fabric8/java/generator/nodes/JObjectExtraAnnotations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
15 changes: 0 additions & 15 deletions ...est.generate_withValidCrd_shouldGeneratePojos.testCrontabExtraAnnotationsCrd.approved.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
5 changes: 0 additions & 5 deletions java-generator/it/src/it/cert-manager/expected/Auth.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
0 ...r/it/src/it/cert-manager/pom.xml.disabled → ...-generator/it/src/it/cert-manager/pom.xml
View file
Open in desktop
File renamed without changes.
Loading