[java-generator] Fix additionalProperties ser/deser

[andreaTP]

Description

Fix #4543

Type of change

• Bug fix (non-breaking change which fixes an issue)
• Feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change
• Chore (non-breaking change which doesn't affect codebase;
  test, version modification, documentation, etc.)

Checklist

• Code contributed by me aligns with current project license: Apache 2.0
• I Added CHANGELOG entry regarding this change
• I have implemented unit tests to cover my changes
• I have added/updated the javadocs and other documentation accordingly
• No new bugs, code smells, etc. in SonarCloud report
• I tested my code in Kubernetes
• I tested my code in OpenShift

[andreaTP]

cc @mteubner

[shawkins]

Should this be setAdditionalProperty singular?

[andreaTP]

Surprisingly not, the integration test fails if I make it singular.

[mteubner]

So probably some jackson magic :)

[andreaTP]

yup, at least now is properly tested 🙂

[shawkins]

Suggested change

	MethodDeclaration additionalSetter = clz.addMethod("setAdditionalProperties", Modifier.Keyword.PUBLIC);
	MethodDeclaration additionalSetter = clz.addMethod("setAdditionalProperty", Modifier.Keyword.PUBLIC);

Sorry, I may not be being clear. I would expect both the test and this logic to say setAdditionalProperty singular. That lines up with the model generation logic in the main project - Pod.setAdditionalProperty.

[andreaTP]

Right, that's what I did, changing both breaks the functionality I'm fixing here as demonstrated by the additional test included in this PR.

If you are still in doubt I propose to have a quick sync on it to clarify somewhere next week ;-)

[shawkins]

Sorry, it would probably be best to compare to what's already in use. The core model classes are generated with:

    @JsonIgnore
    private Map<String, Object> additionalProperties = new HashMap<String, Object>();

   @JsonAnyGetter
    public Map<String, Object> getAdditionalProperties() {
        return this.additionalProperties;
    }

    @JsonAnySetter
    public void setAdditionalProperty(String name, Object value) {
        this.additionalProperties.put(name, value);
    }

due to a limitation in the jsonschema2pojo,

@JsonIgnore
void setAdditionalProperties(Map<String, Object> properties)

being generated by the class annotations:

@Setter
@Accessors(prefix = {
    "_",
    ""
})

As far as I know that handles all of the issues we have seen with serdes and builder logic.

Could you try aligning to that?

[andreaTP]

@shawkins sorry for the long forth and back, the integration test failure was due to a different reason ... fixed now 👍

[sonarcloud]

Kudos, SonarCloud Quality Gate passed!   

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

100.0% Coverage
0.0% Duplication

[shawkins]

LGTM

[mteubner]

@andreaTP Do I do something wrong on that? When I check out the master branch, und try to build this test, I still get

package io.dapr.v1alpha1.componentspec;

@com.fasterxml.jackson.annotation.JsonInclude(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
@com.fasterxml.jackson.annotation.JsonPropertyOrder({})
@com.fasterxml.jackson.databind.annotation.JsonDeserialize(using = com.fasterxml.jackson.databind.JsonDeserializer.None.class)
public class Test implements io.fabric8.kubernetes.api.model.KubernetesResource {

@com.fasterxml.jackson.annotation.JsonIgnore()
private java.util.Map<String, Object> additionalProperties = new java.util.HashMap<>();

@com.fasterxml.jackson.annotation.JsonAnyGetter()
public java.util.Map<String, Object> getAdditionalProperties() {
    return additionalProperties;
}

@com.fasterxml.jackson.annotation.JsonAnySetter()
public void setAdditionalProperties(java.util.Map<String, Object> additionalProperties) {
    this.additionalProperties = additionalProperties;
}

}

@mteubner you should execute mvn install, if you want to use the new code, not verify :(

@andreaTP workgs fine for me, thx a lot