Release

.github/workflows/broken-links.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Link Checker
         id: lychee
-        uses: lycheeverse/lychee-action@82202e5e9c2f4ef1a55a3d02563e1cb6041e5332 # v2
+        uses: lycheeverse/lychee-action@5c4ee84814c983aa7164eaee476f014e53ff3963 # v2
         with:
           fail: false # Don't fail on broken links, create an issue instead
 
@@ -31,13 +31,13 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Close issue if everything is fine
-        if: env.lychee_exit_code == 0 && steps.find-issue.outputs.number != ''
+        if: steps.lychee.outputs.exit_code == 0 && steps.find-issue.outputs.number != ''
         run: gh issue close -r 'not planned' ${{ steps.find-issue.outputs.number }}
         env:
           GH_TOKEN: ${{ github.token }}
 
       - name: Create Issue From File
-        if: env.lychee_exit_code != 0
+        if: steps.lychee.outputs.exit_code != 0
         uses: peter-evans/create-issue-from-file@e8ef132d6df98ed982188e460ebb3b5d4ef3a9cd # v5
         with:
           issue-number: ${{ steps.find-issue.outputs.number }}

.github/workflows/check-build.yml

@@ -20,7 +20,6 @@ on:
       - 'assets/**'
 
 env:
-  PRIMARY_MAVEN_MODULE: ${{ github.event.repository.name }}
   DEMO_MAVEN_MODULE: ${{ github.event.repository.name }}-demo
 
 jobs:

.github/workflows/release.yml

@@ -104,9 +104,6 @@ jobs:
     runs-on: ubuntu-latest
     needs: [prepare-release]
     timeout-minutes: 60
-    permissions:
-      contents: read
-      packages: write
     steps:
     - uses: actions/checkout@v4
 
@@ -121,15 +118,17 @@ jobs:
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'
+        server-id: github-central
+        server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
-    - name: Publish to Central Portal
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
+    - name: Publish to GitHub Packages Central
+      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
+      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
-      working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
 
     - name: Set up JDK
       uses: actions/setup-java@v4

.github/workflows/test-deploy.yml

@@ -10,9 +10,6 @@ jobs:
   publish-maven:
     runs-on: ubuntu-latest
     timeout-minutes: 60
-    permissions:
-      contents: read
-      packages: write
     steps:
     - uses: actions/checkout@v4
 
@@ -21,14 +18,16 @@ jobs:
       with: # running setup-java overwrites the settings.xml
         distribution: 'temurin'
         java-version: '17'
+        server-id: github-central
+        server-password: PACKAGES_CENTRAL_TOKEN
         gpg-passphrase: MAVEN_GPG_PASSPHRASE
         gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Only import once
 
-    - name: Publish to GitHub Packages
-      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github::https://maven.pkg.github.com/${{ github.repository }}
+    - name: Publish to GitHub Packages Central
+      run: ../mvnw -B deploy -P publish -DskipTests -DaltDeploymentRepository=github-central::https://maven.pkg.github.com/xdev-software/central
       working-directory: ${{ env.PRIMARY_MAVEN_MODULE }}
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PACKAGES_CENTRAL_TOKEN: ${{ secrets.PACKAGES_CENTRAL_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
     - name: Set up JDK

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.1.1
+* Fixed some incorrectly generated classes for ``additionalProperties: oneOf: ...`` #181
+
 # 1.1.0
 * Updated generated code from Brevo's openapi.yml
 * Updated references to "new" official Brevo client #

brevo-java-client-demo/src/main/java/software/xdev/Application.java

@@ -9,6 +9,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import software.xdev.brevo.IdentifierType;
 import software.xdev.brevo.api.ContactsApi;
 import software.xdev.brevo.client.ApiClient;
 import software.xdev.brevo.client.ApiException;
@@ -42,7 +43,7 @@ public static void main(final String[] args)
 				new GetContactInfoIdentifierStringParameter(email);
 			final GetExtendedContactDetails contactInfo = contactsApi.getContactInfo(
 				identifier,
-				null,
+				IdentifierType.EMAIL,
 				null,
 				null);
 			LOG.info("Got contact[email={},listIds={}]", contactInfo.getEmail(), contactInfo.getListIds());
@@ -51,7 +52,7 @@ public static void main(final String[] args)
 				contactsApi.updateContact(
 					identifier,
 					new UpdateContact().listIds(List.of(listId)),
-					null);
+					IdentifierType.EMAIL);
 				LOG.info("Updated contact to include listId={}", listId);
 			}
 		}

brevo-java-client/pom.xml

@@ -61,7 +61,7 @@
 			<dependency>
 				<groupId>com.fasterxml.jackson</groupId>
 				<artifactId>jackson-bom</artifactId>
-				<version>2.19.1</version>
+				<version>2.19.2</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -223,7 +223,7 @@
 					<plugin>
 						<groupId>org.codehaus.mojo</groupId>
 						<artifactId>flatten-maven-plugin</artifactId>
-						<version>1.7.1</version>
+						<version>1.7.2</version>
 						<configuration>
 							<flattenMode>ossrh</flattenMode>
 						</configuration>
@@ -449,7 +449,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>10.26.1</version>
+								<version>11.0.0</version>
 							</dependency>
 						</dependencies>
 						<configuration>
@@ -490,12 +490,12 @@
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-core</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 							<dependency>
 								<groupId>net.sourceforge.pmd</groupId>
 								<artifactId>pmd-java</artifactId>
-								<version>7.15.0</version>
+								<version>7.16.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>

brevo-java-client/src/generated/java/software/xdev/brevo/model/CreateContact.java

@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import software.xdev.brevo.model.CreateDoiContactAttributesValue;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.io.UnsupportedEncodingException;
@@ -57,7 +56,7 @@ public class CreateContact {
 
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
   @jakarta.annotation.Nullable
-  private Map<String, CreateDoiContactAttributesValue> attributes = new HashMap<>();
+  private Map<String, Object> attributes = new HashMap<>();
 
   public static final String JSON_PROPERTY_EMAIL_BLACKLISTED = "emailBlacklisted";
   @jakarta.annotation.Nullable
@@ -132,13 +131,13 @@ public void setExtId(@jakarta.annotation.Nullable String extId) {
     this.extId = extId;
   }
 
-  public CreateContact attributes(@jakarta.annotation.Nullable Map<String, CreateDoiContactAttributesValue> attributes) {
+  public CreateContact attributes(@jakarta.annotation.Nullable Map<String, Object> attributes) {
 
     this.attributes = attributes;
     return this;
   }
 
-  public CreateContact putAttributesItem(String key, CreateDoiContactAttributesValue attributesItem) {
+  public CreateContact putAttributesItem(String key, Object attributesItem) {
     if (this.attributes == null) {
       this.attributes = new HashMap<>();
     }
@@ -152,16 +151,16 @@ public CreateContact putAttributesItem(String key, CreateDoiContactAttributesVal
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
 
-  public Map<String, CreateDoiContactAttributesValue> getAttributes() {
+  public Map<String, Object> getAttributes() {
     return attributes;
   }
 
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setAttributes(@jakarta.annotation.Nullable Map<String, CreateDoiContactAttributesValue> attributes) {
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
+  public void setAttributes(@jakarta.annotation.Nullable Map<String, Object> attributes) {
     this.attributes = attributes;
   }
 
@@ -412,9 +411,13 @@ public String toUrlQueryString(String prefix) {
     // add `attributes` to the URL query string
     if (getAttributes() != null) {
       for (String _key : getAttributes().keySet()) {
-        if (getAttributes().get(_key) != null) {
-          joiner.add(getAttributes().get(_key).toUrlQueryString(String.format("%sattributes%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix))));
+        try {
+          joiner.add(String.format("%sattributes%s%s=%s", prefix, suffix,
+              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix),
+              getAttributes().get(_key), URLEncoder.encode(String.valueOf(getAttributes().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
+        } catch (UnsupportedEncodingException e) {
+          // Should never happen, UTF-8 is always supported
+          throw new RuntimeException(e);
         }
       }
     }

brevo-java-client/src/generated/java/software/xdev/brevo/model/CreateDoiContact.java

@@ -25,7 +25,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import software.xdev.brevo.model.CreateDoiContactAttributesValue;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import com.fasterxml.jackson.annotation.JsonTypeName;
 import java.io.UnsupportedEncodingException;
@@ -51,7 +50,7 @@ public class CreateDoiContact {
 
   public static final String JSON_PROPERTY_ATTRIBUTES = "attributes";
   @jakarta.annotation.Nullable
-  private Map<String, CreateDoiContactAttributesValue> attributes = new HashMap<>();
+  private Map<String, Object> attributes = new HashMap<>();
 
   public static final String JSON_PROPERTY_INCLUDE_LIST_IDS = "includeListIds";
   @jakarta.annotation.Nonnull
@@ -97,13 +96,13 @@ public void setEmail(@jakarta.annotation.Nonnull String email) {
     this.email = email;
   }
 
-  public CreateDoiContact attributes(@jakarta.annotation.Nullable Map<String, CreateDoiContactAttributesValue> attributes) {
+  public CreateDoiContact attributes(@jakarta.annotation.Nullable Map<String, Object> attributes) {
 
     this.attributes = attributes;
     return this;
   }
 
-  public CreateDoiContact putAttributesItem(String key, CreateDoiContactAttributesValue attributesItem) {
+  public CreateDoiContact putAttributesItem(String key, Object attributesItem) {
     if (this.attributes == null) {
       this.attributes = new HashMap<>();
     }
@@ -117,16 +116,16 @@ public CreateDoiContact putAttributesItem(String key, CreateDoiContactAttributes
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
 
-  public Map<String, CreateDoiContactAttributesValue> getAttributes() {
+  public Map<String, Object> getAttributes() {
     return attributes;
   }
 
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTES)
-  @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setAttributes(@jakarta.annotation.Nullable Map<String, CreateDoiContactAttributesValue> attributes) {
+  @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
+  public void setAttributes(@jakarta.annotation.Nullable Map<String, Object> attributes) {
     this.attributes = attributes;
   }
 
@@ -338,9 +337,13 @@ public String toUrlQueryString(String prefix) {
     // add `attributes` to the URL query string
     if (getAttributes() != null) {
       for (String _key : getAttributes().keySet()) {
-        if (getAttributes().get(_key) != null) {
-          joiner.add(getAttributes().get(_key).toUrlQueryString(String.format("%sattributes%s%s", prefix, suffix,
-              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix))));
+        try {
+          joiner.add(String.format("%sattributes%s%s=%s", prefix, suffix,
+              "".equals(suffix) ? "" : String.format("%s%d%s", containerPrefix, _key, containerSuffix),
+              getAttributes().get(_key), URLEncoder.encode(String.valueOf(getAttributes().get(_key)), "UTF-8").replaceAll("\\+", "%20")));
+        } catch (UnsupportedEncodingException e) {
+          // Should never happen, UTF-8 is always supported
+          throw new RuntimeException(e);
         }
       }
     }