diff --git a/README.md b/README.md index 43bef61..30d121e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![Maven metadata URL](https://img.shields.io/maven-metadata/v?metadataUrl=https%3A%2F%2Freleases.aspose.cloud%2Fjava%2Frepo%2Fcom%2Faspose%2Faspose-barcode-cloud%2Fmaven-metadata.xml)](https://releases.aspose.cloud/java/repo/com/aspose/aspose-barcode-cloud/) - API version: 4.0 -- SDK version: 26.6.0 +- SDK version: 26.7.0 ## SDK and API Version Compatibility: @@ -77,7 +77,7 @@ Add this dependency to your project's POM: com.aspose aspose-barcode-cloud - 26.6.0 + 26.7.0 compile ``` @@ -92,7 +92,7 @@ mvn clean package Then manually install the following JARs: -- `target/aspose-barcode-cloud-26.6.0.jar` +- `target/aspose-barcode-cloud-26.7.0.jar` - `target/lib/*.jar` ## Getting Started diff --git a/pom.xml b/pom.xml index 9078fea..0742657 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ aspose-barcode-cloud jar aspose-barcode-cloud - 26.6.0 + 26.7.0 https://www.aspose.cloud Aspose.BarCode Cloud SDK for Java @@ -223,10 +223,10 @@ ${java.version} ${java.version} 2.14.0 - 5.3.2 + 5.4.0 1.0.0 4.13.2 - 0.8.14 + 0.8.15 2.21.0 UTF-8 diff --git a/scripts/check-badges.bash b/scripts/check-badges.bash index 578d958..a79bc39 100755 --- a/scripts/check-badges.bash +++ b/scripts/check-badges.bash @@ -16,7 +16,7 @@ pushd "${SCRIPT_DIR}/.." >/dev/null fi done -(grep -oP '[^/]+\.yml/badge.svg(?!\?branch=main)' "${readme_file}" || echo ) | while read -r badge_without_branch; do +(grep -oP '[^/]+\.yml/badge.svg(?!\?branch=(main|v4)\b)' "${readme_file}" || echo ) | while read -r badge_without_branch; do if [ -z "${badge_without_branch}" ]; then continue; fi >&2 echo "Badge without branch \"${badge_without_branch}\"" exit 1 diff --git a/snippets/dependency.xml b/snippets/dependency.xml index 45c8796..635a540 100644 --- a/snippets/dependency.xml +++ b/snippets/dependency.xml @@ -11,7 +11,7 @@ com.aspose aspose-barcode-cloud - 26.6.0 + 26.7.0 \ No newline at end of file diff --git a/src/main/java/com/aspose/barcode/cloud/ApiClient.java b/src/main/java/com/aspose/barcode/cloud/ApiClient.java index 9f4973d..86629d4 100644 --- a/src/main/java/com/aspose/barcode/cloud/ApiClient.java +++ b/src/main/java/com/aspose/barcode/cloud/ApiClient.java @@ -40,7 +40,7 @@ /** ApiClient. */ public class ApiClient { public final String apiVersion = "v4.0"; - public final String clientVersion = "26.6.0"; + public final String clientVersion = "26.7.0"; private String baseUrl = "https://api.aspose.cloud"; private String tokenUrl = "https://id.aspose.cloud/connect/token"; @@ -88,7 +88,7 @@ protected ApiClient(long readTimeoutMillis) { json = new JSON(); // Set default User-Agent. - setUserAgent("OpenApi-Generator/26.6.0/java"); + setUserAgent("OpenApi-Generator/26.7.0/java"); addDefaultHeader("x-aspose-client", "java sdk"); addDefaultHeader("x-aspose-client-version", clientVersion); diff --git a/src/main/java/com/aspose/barcode/cloud/ServerConfiguration.java b/src/main/java/com/aspose/barcode/cloud/ServerConfiguration.java deleted file mode 100644 index 97727ba..0000000 --- a/src/main/java/com/aspose/barcode/cloud/ServerConfiguration.java +++ /dev/null @@ -1,91 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// Copyright (c) 2026 Aspose.BarCode for Cloud -// -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// -------------------------------------------------------------------------------------------------------------------- - -package com.aspose.barcode.cloud; - -import java.util.Map; - -/** Representing a Server configuration. */ -public class ServerConfiguration { - public String url; - public String description; - public Map variables; - - /** - * Constructor - * - * @param url A url to the target host. - * @param description A description of the host designated by the url. - * @param variables A map between a variable name and its value. The value is used for - * substitution in the server's url template. - */ - public ServerConfiguration( - String url, String description, Map variables) { - this.url = url; - this.description = description; - this.variables = variables; - } - - /** - * Format url template using given variables. - * - * @param variables A map between a variable name and its value. - * @return Formatted url. - */ - public String url(Map variables) { - String url = this.url; - - // go through variables and replace placeholders - for (Map.Entry variable : this.variables.entrySet()) { - String name = variable.getKey(); - ServerVariable serverVariable = variable.getValue(); - String value = serverVariable.defaultValue; - - if (variables != null && variables.containsKey(name)) { - value = variables.get(name); - if (serverVariable.enumValues.size() > 0 - && !serverVariable.enumValues.contains(value)) { - throw new IllegalArgumentException( - "The variable " - + name - + " in the server url has invalid value " - + value - + "."); - } - } - url = url.replace("{" + name + "}", value); - } - return url; - } - - /** - * Format url template using default server variables. - * - * @return Formatted url. - */ - public String url() { - return url(null); - } -} diff --git a/src/main/java/com/aspose/barcode/cloud/ServerVariable.java b/src/main/java/com/aspose/barcode/cloud/ServerVariable.java deleted file mode 100644 index 90949ed..0000000 --- a/src/main/java/com/aspose/barcode/cloud/ServerVariable.java +++ /dev/null @@ -1,49 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// Copyright (c) 2026 Aspose.BarCode for Cloud -// -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// -------------------------------------------------------------------------------------------------------------------- - -package com.aspose.barcode.cloud; - -import java.util.HashSet; - -/** Representing a Server Variable for server URL template substitution. */ -public class ServerVariable { - public String description; - public String defaultValue; - public HashSet enumValues = null; - - /** - * Constructor - * - * @param description A description for the server variable. - * @param defaultValue The default value to use for substitution. - * @param enumValues An enumeration of string values to be used if the substitution options are - * from a limited set. - */ - public ServerVariable(String description, String defaultValue, HashSet enumValues) { - this.description = description; - this.defaultValue = defaultValue; - this.enumValues = enumValues; - } -} diff --git a/src/main/java/com/aspose/barcode/cloud/model/AbstractOpenApiSchema.java b/src/main/java/com/aspose/barcode/cloud/model/AbstractOpenApiSchema.java deleted file mode 100644 index eed95ae..0000000 --- a/src/main/java/com/aspose/barcode/cloud/model/AbstractOpenApiSchema.java +++ /dev/null @@ -1,156 +0,0 @@ -// -------------------------------------------------------------------------------------------------------------------- -// -// Copyright (c) 2026 Aspose.BarCode for Cloud -// -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. -// -// -------------------------------------------------------------------------------------------------------------------- - -package com.aspose.barcode.cloud.model; - -import java.util.Map; -import java.util.Objects; - -/** Abstract class for oneOf,anyOf schemas defined in OpenAPI spec */ -public abstract class AbstractOpenApiSchema { - - // store the actual instance of the schema/object - private Object instance; - - // is nullable - private Boolean isNullable; - - // schema type (e.g. oneOf, anyOf) - private final String schemaType; - - public AbstractOpenApiSchema(String schemaType, Boolean isNullable) { - this.schemaType = schemaType; - this.isNullable = isNullable; - } - - /** - * Get the list of oneOf/anyOf composed schemas allowed to be stored in this object - * - * @return an instance of the actual schema/object - */ - public abstract Map> getSchemas(); - - /** - * Get the actual instance - * - * @return an instance of the actual schema/object - */ - // @JsonValue - public Object getActualInstance() { - return instance; - } - - /** - * Set the actual instance - * - * @param instance the actual instance of the schema/object - */ - public void setActualInstance(Object instance) { - this.instance = instance; - } - - /** - * Get the instant recursively when the schemas defined in oneOf/anyof happen to be oneOf/anyOf - * schema as well - * - * @return an instance of the actual schema/object - */ - public Object getActualInstanceRecursively() { - return getActualInstanceRecursively(this); - } - - private Object getActualInstanceRecursively(AbstractOpenApiSchema object) { - if (object.getActualInstance() == null) { - return null; - } else if (object.getActualInstance() instanceof AbstractOpenApiSchema) { - return getActualInstanceRecursively((AbstractOpenApiSchema) object.getActualInstance()); - } else { - return object.getActualInstance(); - } - } - - /** - * Get the schema type (e.g. anyOf, oneOf) - * - * @return the schema type - */ - public String getSchemaType() { - return schemaType; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append("class ").append(getClass()).append(" {\n"); - sb.append(" instance: ").append(toIndentedString(instance)).append("\n"); - sb.append(" isNullable: ").append(toIndentedString(isNullable)).append("\n"); - sb.append(" schemaType: ").append(toIndentedString(schemaType)).append("\n"); - sb.append("}"); - return sb.toString(); - } - - /** - * Convert the given object to string with each line indented by 4 spaces (except the first - * line). - */ - private String toIndentedString(Object o) { - if (o == null) { - return "null"; - } - return o.toString().replace("\n", "\n "); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - AbstractOpenApiSchema a = (AbstractOpenApiSchema) o; - return Objects.equals(this.instance, a.instance) - && Objects.equals(this.isNullable, a.isNullable) - && Objects.equals(this.schemaType, a.schemaType); - } - - @Override - public int hashCode() { - return Objects.hash(instance, isNullable, schemaType); - } - - /** - * Is nullable - * - * @return true if it's nullable - */ - public Boolean isNullable() { - if (Boolean.TRUE.equals(isNullable)) { - return Boolean.TRUE; - } else { - return Boolean.FALSE; - } - } -} diff --git a/src/test/java/com/aspose/barcode/cloud/SdkCoreCoverageTest.java b/src/test/java/com/aspose/barcode/cloud/SdkCoreCoverageTest.java index befc6f4..b70f552 100644 --- a/src/test/java/com/aspose/barcode/cloud/SdkCoreCoverageTest.java +++ b/src/test/java/com/aspose/barcode/cloud/SdkCoreCoverageTest.java @@ -19,7 +19,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; @@ -57,27 +56,6 @@ public void apiExceptionBuildsDetailsFromErrorResponseBodyOrEmptyFallback() { instanceof IllegalStateException); } - @Test - public void serverConfigurationExpandsDefaultsOverridesAndRejectsInvalidEnums() { - HashSet enumValues = new HashSet<>(Arrays.asList("v4.0", "v5.0")); - ServerVariable version = new ServerVariable("version", "v4.0", enumValues); - Map variables = Collections.singletonMap("version", version); - ServerConfiguration server = - new ServerConfiguration("https://api.aspose.cloud/{version}", "Aspose", variables); - - assertEquals("https://api.aspose.cloud/v4.0", server.url()); - assertEquals( - "https://api.aspose.cloud/v5.0", - server.url(Collections.singletonMap("version", "v5.0"))); - - try { - server.url(Collections.singletonMap("version", "v6.0")); - fail("Expected invalid enum value to be rejected"); - } catch (IllegalArgumentException e) { - assertTrue(e.getMessage().contains("invalid value v6.0")); - } - } - @Test public void apiClientFormatsHeadersParametersUrlsAndMultipartBodies() { ApiClient client = new ApiClient("fake-token"); diff --git a/src/test/java/com/aspose/barcode/cloud/model/GeneratedModelCoverageTest.java b/src/test/java/com/aspose/barcode/cloud/model/GeneratedModelCoverageTest.java index 65e8ec9..86567a0 100644 --- a/src/test/java/com/aspose/barcode/cloud/model/GeneratedModelCoverageTest.java +++ b/src/test/java/com/aspose/barcode/cloud/model/GeneratedModelCoverageTest.java @@ -10,9 +10,7 @@ import java.time.OffsetDateTime; import java.util.Arrays; import java.util.Collections; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; public class GeneratedModelCoverageTest { private static final Gson GSON = new Gson(); @@ -98,33 +96,6 @@ public void generatedModelsExposeValueObjectBehavior() throws Exception { } } - @Test - public void abstractOpenApiSchemaHandlesNestedInstances() { - TestOpenApiSchema outer = new TestOpenApiSchema("oneOf", true); - TestOpenApiSchema same = new TestOpenApiSchema("oneOf", true); - TestOpenApiSchema inner = new TestOpenApiSchema("anyOf", false); - inner.setActualInstance("leaf"); - outer.setActualInstance(inner); - same.setActualInstance(inner); - - assertEquals(Collections.singletonMap("string", String.class), outer.getSchemas()); - assertSame(inner, outer.getActualInstance()); - assertEquals("leaf", outer.getActualInstanceRecursively()); - assertEquals("oneOf", outer.getSchemaType()); - assertTrue(outer.isNullable()); - assertFalse(inner.isNullable()); - assertEquals(outer, same); - assertEquals(outer.hashCode(), same.hashCode()); - assertNotEquals(outer, inner); - assertNotEquals(outer, null); - assertNotEquals(outer, "not a schema"); - assertTrue(outer.toString().contains("oneOf")); - - TestOpenApiSchema empty = new TestOpenApiSchema("oneOf", null); - assertNull(empty.getActualInstanceRecursively()); - assertFalse(empty.isNullable()); - } - private static boolean isValueAccessor(Method method) { if (method.getParameterCount() != 0 || method.getDeclaringClass().equals(Object.class)) { return false; @@ -274,17 +245,4 @@ private static RegionPoint regionPoint(int variant) { point.setY(20 + variant); return point; } - - private static class TestOpenApiSchema extends AbstractOpenApiSchema { - TestOpenApiSchema(String schemaType, Boolean isNullable) { - super(schemaType, isNullable); - } - - @Override - public Map> getSchemas() { - Map> schemas = new LinkedHashMap<>(); - schemas.put("string", String.class); - return schemas; - } - } }