diff --git a/.gitignore b/.gitignore index fab2364e..b72ade28 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ .project .settings/ +.vscode/ # Intellij .idea/ *.iml diff --git a/pom.xml b/pom.xml index 4363d975..cb7a6648 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.channelape shopify-sdk - 2.9.2 + 2.9.3-SNAPSHOT Shopify SDK Java SDK for Shopify REST API. @@ -56,11 +56,12 @@ 1.8 1.8 1.8 - 4.13.1 - 1.7.22 - 2.25.1 + 5.10.1 + 2.0.9 + 3.1.3 1.4.3 - 0.8.2 + 0.8.11 + 2.16.0 @@ -75,9 +76,19 @@ ${jersey.version} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - 2.4.0 + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.1 + + + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider + ${jackson-jakarta.version} + + + com.fasterxml.jackson.module + jackson-module-jakarta-xmlbind-annotations + ${jackson-jakarta.version} org.glassfish.jersey.media @@ -92,18 +103,22 @@ org.apache.commons commons-lang3 - 3.4 + 3.14.0 - org.apache.commons - commons-io - 1.3.2 + commons-io + commons-io + 2.15.0 - joda-time joda-time - 2.9.9 + 2.12.5 + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + 2.16.0 org.jscience @@ -113,7 +128,7 @@ org.json json - 20160810 + 20231013 org.slf4j @@ -126,42 +141,66 @@ 2.0.0 - javax.xml.bind - jaxb-api - 2.3.0 + jakarta.activation + jakarta.activation-api + 2.1.2 - com.sun.xml.bind + org.glassfish.jaxb jaxb-core - 2.3.0 + 4.0.4 + + + org.glassfish.jaxb + jaxb-runtime + 4.0.4 - com.sun.xml.bind - jaxb-impl - 2.3.0 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 - javax.activation - activation - 1.1.1 + org.projectlombok + lombok + 1.18.30 + provided - junit - junit - ${junit.version} + org.junit.jupiter + junit-jupiter-api + ${junit-jupiter.version} + test + + + org.junit.jupiter + junit-jupiter-migrationsupport + ${junit-jupiter.version} test org.mockito mockito-core - 1.10.19 + 5.7.0 + test + + + org.mockito + mockito-junit-jupiter + 4.11.0 test com.github.rest-driver rest-client-driver - 2.0.0 + 2.0.1 + test + + + org.junit.jupiter + junit-jupiter + 5.10.1 test @@ -174,7 +213,6 @@ - org.jacoco jacoco-maven-plugin @@ -209,6 +247,7 @@ org.apache.maven.plugins maven-failsafe-plugin + 3.2.2 @@ -221,7 +260,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.11.0 ${java.version} ${java.version} @@ -230,6 +269,7 @@ org.apache.maven.plugins maven-source-plugin + 3.3.0 attach-sources @@ -242,6 +282,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.6.2 -Xdoclint:none 8 @@ -266,7 +307,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13 true ossrh @@ -289,6 +330,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 3.6.2 -Xdoclint:none @@ -304,12 +346,12 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.1.0 - - --pinentry-mode - loopback - + + --pinentry-mode + loopback + diff --git a/src/main/java/com/shopify/ShopifySdk.java b/src/main/java/com/shopify/ShopifySdk.java index dff77ff1..0eb2c862 100644 --- a/src/main/java/com/shopify/ShopifySdk.java +++ b/src/main/java/com/shopify/ShopifySdk.java @@ -10,14 +10,14 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Link; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Link; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.glassfish.jersey.client.ClientProperties; @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; import com.github.rholder.retry.Attempt; import com.github.rholder.retry.RetryException; import com.github.rholder.retry.RetryListener; @@ -1056,7 +1056,7 @@ private Response invokeResponseCallable(final Callable responseCallabl } private Retryer buildResponseRetyer() { - return RetryerBuilder. newBuilder().retryIfResult(ShopifySdk::shouldRetryResponse).retryIfException() + return RetryerBuilder.newBuilder().retryIfResult(ShopifySdk::shouldRetryResponse).retryIfException() .withWaitStrategy(WaitStrategies.randomWait(minimumRequestRetryRandomDelayMilliseconds, TimeUnit.MILLISECONDS, maximumRequestRetryRandomDelayMilliseconds, TimeUnit.MILLISECONDS)) .withStopStrategy( @@ -1142,7 +1142,7 @@ private WebTarget getWebTarget() { private static Client buildClient() { final ObjectMapper mapper = ShopifySdkObjectMapper.buildMapper(); - final JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider(); + final JacksonJsonProvider provider = new JacksonJsonProvider(); provider.setMapper(mapper); return ClientBuilder.newClient().register(JacksonFeature.class).register(provider); diff --git a/src/main/java/com/shopify/exceptions/ShopifyErrorResponseException.java b/src/main/java/com/shopify/exceptions/ShopifyErrorResponseException.java index 785e03d5..001a4049 100644 --- a/src/main/java/com/shopify/exceptions/ShopifyErrorResponseException.java +++ b/src/main/java/com/shopify/exceptions/ShopifyErrorResponseException.java @@ -2,10 +2,14 @@ import java.util.List; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import com.shopify.mappers.ResponseEntityToStringMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +@Data +@EqualsAndHashCode(callSuper = false) public class ShopifyErrorResponseException extends RuntimeException { static final String MESSAGE = "Received unexpected Response Status Code of %d\nResponse Headers of:\n%s\nResponse Body of:\n%s"; @@ -26,16 +30,4 @@ private static String buildMessage(final Response response) { return String.format(MESSAGE, response.getStatus(), response.getStringHeaders(), readEntity); } - public int getStatusCode() { - return statusCode; - } - - public String getResponseBody() { - return responseBody; - } - - public List getShopifyErrorCodes() { - return shopifyErrorCodes; - } - } diff --git a/src/main/java/com/shopify/mappers/ResponseEntityToStringMapper.java b/src/main/java/com/shopify/mappers/ResponseEntityToStringMapper.java index 57216e8d..15a6d8f8 100644 --- a/src/main/java/com/shopify/mappers/ResponseEntityToStringMapper.java +++ b/src/main/java/com/shopify/mappers/ResponseEntityToStringMapper.java @@ -3,7 +3,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/shopify/mappers/ShopifySdkObjectMapper.java b/src/main/java/com/shopify/mappers/ShopifySdkObjectMapper.java index de871e5e..52a0caa4 100644 --- a/src/main/java/com/shopify/mappers/ShopifySdkObjectMapper.java +++ b/src/main/java/com/shopify/mappers/ShopifySdkObjectMapper.java @@ -6,24 +6,22 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.databind.type.TypeFactory; -import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector; +import com.fasterxml.jackson.datatype.joda.JodaModule; +import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; public class ShopifySdkObjectMapper { - private ShopifySdkObjectMapper() { - } + private ShopifySdkObjectMapper() { + } - public static ObjectMapper buildMapper() { - final ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); - - final AnnotationIntrospector pair = AnnotationIntrospector.pair( - new JaxbAnnotationIntrospector(TypeFactory.defaultInstance()), new JacksonAnnotationIntrospector()); - mapper.setAnnotationIntrospector(pair); - - mapper.enable(MapperFeature.USE_ANNOTATIONS); - return mapper; - } + public static ObjectMapper buildMapper() { + final AnnotationIntrospector inter = AnnotationIntrospector.pair( + new JakartaXmlBindAnnotationIntrospector(TypeFactory.defaultInstance()), + new JacksonAnnotationIntrospector()); + return JsonMapper.builder().addModule(new JodaModule()).enable(MapperFeature.USE_ANNOTATIONS) + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .serializationInclusion(JsonInclude.Include.NON_NULL).annotationIntrospector(inter).build(); + } } diff --git a/src/main/java/com/shopify/model/Count.java b/src/main/java/com/shopify/model/Count.java index b961a8e0..96b5eec3 100644 --- a/src/main/java/com/shopify/model/Count.java +++ b/src/main/java/com/shopify/model/Count.java @@ -1,17 +1,12 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import lombok.Data; +@Data @XmlRootElement public class Count { private int count; - public int getCount() { - return count; - } - - public void setCount(int count) { - this.count = count; - } } diff --git a/src/main/java/com/shopify/model/Image.java b/src/main/java/com/shopify/model/Image.java index 5e135532..ca9143d3 100644 --- a/src/main/java/com/shopify/model/Image.java +++ b/src/main/java/com/shopify/model/Image.java @@ -3,14 +3,16 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.shopify.model.adapters.EscapedStringAdapter; +import lombok.Data; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class Image { @@ -27,60 +29,4 @@ public class Image { private List variantIds = new LinkedList<>(); private List metafields = new LinkedList<>(); - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getProductId() { - return productId; - } - - public void setProductId(String productId) { - this.productId = productId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public int getPosition() { - return position; - } - - public void setPosition(int position) { - this.position = position; - } - - public String getSource() { - return source; - } - - public void setSource(String source) { - this.source = source; - } - - public List getVariantIds() { - return variantIds; - } - - public void setVariantIds(List variantIds) { - this.variantIds = variantIds; - } - - public List getMetafields() { - return metafields; - } - - public void setMetafields(List metafields) { - this.metafields = metafields; - } - } diff --git a/src/main/java/com/shopify/model/InventoryPolicy.java b/src/main/java/com/shopify/model/InventoryPolicy.java index d2e6b08f..180af66e 100644 --- a/src/main/java/com/shopify/model/InventoryPolicy.java +++ b/src/main/java/com/shopify/model/InventoryPolicy.java @@ -17,7 +17,7 @@ public static InventoryPolicy toEnum(String value) { } else if (CONTINUE.toString().equals(value)) { return InventoryPolicy.CONTINUE; } - throw new IllegalArgumentException(String.format(NO_MATCHING_ENUMS_ERROR_MESSAGE, value)); + throw new IllegalArgumentException(NO_MATCHING_ENUMS_ERROR_MESSAGE.formatted(value)); } @Override diff --git a/src/main/java/com/shopify/model/Metafield.java b/src/main/java/com/shopify/model/Metafield.java index fd70c7c8..594480b6 100644 --- a/src/main/java/com/shopify/model/Metafield.java +++ b/src/main/java/com/shopify/model/Metafield.java @@ -1,16 +1,18 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import lombok.Data; import org.joda.time.DateTime; import com.shopify.model.adapters.DateTimeAdapter; import com.shopify.model.adapters.MetafieldTypeAdapter; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class Metafield { @@ -33,76 +35,4 @@ public class Metafield { @XmlJavaTypeAdapter(DateTimeAdapter.class) private DateTime updatedAt; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public MetafieldType getType() { - return type; - } - - public void setType(MetafieldType type) { - this.type = type; - } - - public String getNamespace() { - return namespace; - } - - public void setNamespace(String namespace) { - this.namespace = namespace; - } - - public String getOwnerId() { - return ownerId; - } - - public void setOwnerId(String ownerId) { - this.ownerId = ownerId; - } - - public String getOwnerResource() { - return ownerResource; - } - - public void setOwnerResource(String ownerResource) { - this.ownerResource = ownerResource; - } - - public DateTime getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(DateTime createdAt) { - this.createdAt = createdAt; - } - - public DateTime getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(DateTime updatedAt) { - this.updatedAt = updatedAt; - } - } diff --git a/src/main/java/com/shopify/model/MetafieldRoot.java b/src/main/java/com/shopify/model/MetafieldRoot.java index 12bec034..33553a38 100644 --- a/src/main/java/com/shopify/model/MetafieldRoot.java +++ b/src/main/java/com/shopify/model/MetafieldRoot.java @@ -1,15 +1,10 @@ package com.shopify.model; +import lombok.Data; + +@Data public class MetafieldRoot { private Metafield metafield; - public Metafield getMetafield() { - return metafield; - } - - public void setMetafield(Metafield metafield) { - this.metafield = metafield; - } - } diff --git a/src/main/java/com/shopify/model/MetafieldsRoot.java b/src/main/java/com/shopify/model/MetafieldsRoot.java index 80d0f7ce..fbd1a451 100644 --- a/src/main/java/com/shopify/model/MetafieldsRoot.java +++ b/src/main/java/com/shopify/model/MetafieldsRoot.java @@ -2,17 +2,11 @@ import java.util.LinkedList; import java.util.List; +import lombok.Data; +@Data public class MetafieldsRoot { private List metafields = new LinkedList<>(); - public List getMetafields() { - return metafields; - } - - public void setMetafields(List metafields) { - this.metafields = metafields; - } - } diff --git a/src/main/java/com/shopify/model/Option.java b/src/main/java/com/shopify/model/Option.java index b7335460..3f16dbd2 100644 --- a/src/main/java/com/shopify/model/Option.java +++ b/src/main/java/com/shopify/model/Option.java @@ -3,15 +3,17 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.shopify.model.adapters.EscapedStringAdapter; import com.shopify.model.adapters.EscapedStringsAdapter; +import lombok.Data; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class Option { @@ -25,44 +27,4 @@ public class Option { @XmlJavaTypeAdapter(EscapedStringsAdapter.class) private List values = new LinkedList<>(); - public String getId() { - return id; - } - - public void setId(final String id) { - this.id = id; - } - - public String getProductId() { - return productId; - } - - public void setProductId(final String productId) { - this.productId = productId; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - public int getPosition() { - return position; - } - - public void setPosition(final int position) { - this.position = position; - } - - public List getValues() { - return values; - } - - public void setValues(final List values) { - this.values = values; - } - } diff --git a/src/main/java/com/shopify/model/Shop.java b/src/main/java/com/shopify/model/Shop.java index 1f7e7c32..d7aec486 100644 --- a/src/main/java/com/shopify/model/Shop.java +++ b/src/main/java/com/shopify/model/Shop.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class Shop { diff --git a/src/main/java/com/shopify/model/ShopifyAccessTokenRoot.java b/src/main/java/com/shopify/model/ShopifyAccessTokenRoot.java index a9e4df31..21c709fc 100644 --- a/src/main/java/com/shopify/model/ShopifyAccessTokenRoot.java +++ b/src/main/java/com/shopify/model/ShopifyAccessTokenRoot.java @@ -1,7 +1,7 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyAccessTokenRoot { diff --git a/src/main/java/com/shopify/model/ShopifyAddress.java b/src/main/java/com/shopify/model/ShopifyAddress.java index 044ebc7e..f2142493 100644 --- a/src/main/java/com/shopify/model/ShopifyAddress.java +++ b/src/main/java/com/shopify/model/ShopifyAddress.java @@ -2,10 +2,10 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyAddressUpdateRequest.java b/src/main/java/com/shopify/model/ShopifyAddressUpdateRequest.java index 10ce79d4..3c989bf0 100644 --- a/src/main/java/com/shopify/model/ShopifyAddressUpdateRequest.java +++ b/src/main/java/com/shopify/model/ShopifyAddressUpdateRequest.java @@ -2,10 +2,10 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/shopify/model/ShopifyAdjustment.java b/src/main/java/com/shopify/model/ShopifyAdjustment.java index 183742ee..8a470f35 100644 --- a/src/main/java/com/shopify/model/ShopifyAdjustment.java +++ b/src/main/java/com/shopify/model/ShopifyAdjustment.java @@ -2,10 +2,10 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyAdjustmentsRoot.java b/src/main/java/com/shopify/model/ShopifyAdjustmentsRoot.java index 72f13644..4b11ad1b 100644 --- a/src/main/java/com/shopify/model/ShopifyAdjustmentsRoot.java +++ b/src/main/java/com/shopify/model/ShopifyAdjustmentsRoot.java @@ -3,7 +3,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyAdjustmentsRoot { diff --git a/src/main/java/com/shopify/model/ShopifyAssignedLocation.java b/src/main/java/com/shopify/model/ShopifyAssignedLocation.java index 98ada937..e99b9ce9 100644 --- a/src/main/java/com/shopify/model/ShopifyAssignedLocation.java +++ b/src/main/java/com/shopify/model/ShopifyAssignedLocation.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyAttribute.java b/src/main/java/com/shopify/model/ShopifyAttribute.java index 1b5d7724..49c05439 100644 --- a/src/main/java/com/shopify/model/ShopifyAttribute.java +++ b/src/main/java/com/shopify/model/ShopifyAttribute.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyAttribute { diff --git a/src/main/java/com/shopify/model/ShopifyCancelOrderRequest.java b/src/main/java/com/shopify/model/ShopifyCancelOrderRequest.java index 12a3d8b1..2202e188 100644 --- a/src/main/java/com/shopify/model/ShopifyCancelOrderRequest.java +++ b/src/main/java/com/shopify/model/ShopifyCancelOrderRequest.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyCancelOrderRequest { diff --git a/src/main/java/com/shopify/model/ShopifyCustomCollection.java b/src/main/java/com/shopify/model/ShopifyCustomCollection.java index ee4d0dd4..fdde20f2 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomCollection.java +++ b/src/main/java/com/shopify/model/ShopifyCustomCollection.java @@ -3,11 +3,11 @@ import com.shopify.model.adapters.DateTimeAdapter; import org.joda.time.DateTime; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyCustomCollectionRoot.java b/src/main/java/com/shopify/model/ShopifyCustomCollectionRoot.java index 6cdf6ec1..c03b3319 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomCollectionRoot.java +++ b/src/main/java/com/shopify/model/ShopifyCustomCollectionRoot.java @@ -1,7 +1,7 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyCustomCollectionRoot { diff --git a/src/main/java/com/shopify/model/ShopifyCustomCollectionsRoot.java b/src/main/java/com/shopify/model/ShopifyCustomCollectionsRoot.java index e8460ddd..6351461f 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomCollectionsRoot.java +++ b/src/main/java/com/shopify/model/ShopifyCustomCollectionsRoot.java @@ -1,7 +1,7 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/shopify/model/ShopifyCustomer.java b/src/main/java/com/shopify/model/ShopifyCustomer.java index 7951d292..eee3493f 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomer.java +++ b/src/main/java/com/shopify/model/ShopifyCustomer.java @@ -2,11 +2,11 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.joda.time.DateTime; diff --git a/src/main/java/com/shopify/model/ShopifyCustomerUpdateRequest.java b/src/main/java/com/shopify/model/ShopifyCustomerUpdateRequest.java index ade6e065..4d7df133 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomerUpdateRequest.java +++ b/src/main/java/com/shopify/model/ShopifyCustomerUpdateRequest.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/com/shopify/model/ShopifyCustomerUpdateRoot.java b/src/main/java/com/shopify/model/ShopifyCustomerUpdateRoot.java index b3bf6206..5764b451 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomerUpdateRoot.java +++ b/src/main/java/com/shopify/model/ShopifyCustomerUpdateRoot.java @@ -1,8 +1,8 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyCustomersRoot.java b/src/main/java/com/shopify/model/ShopifyCustomersRoot.java index 6063c14f..31d2a38f 100644 --- a/src/main/java/com/shopify/model/ShopifyCustomersRoot.java +++ b/src/main/java/com/shopify/model/ShopifyCustomersRoot.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/com/shopify/model/ShopifyDeliveryMethod.java b/src/main/java/com/shopify/model/ShopifyDeliveryMethod.java index f8974dd0..831851af 100644 --- a/src/main/java/com/shopify/model/ShopifyDeliveryMethod.java +++ b/src/main/java/com/shopify/model/ShopifyDeliveryMethod.java @@ -1,10 +1,10 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.joda.time.DateTime; diff --git a/src/main/java/com/shopify/model/ShopifyDestination.java b/src/main/java/com/shopify/model/ShopifyDestination.java index 0fb7c153..e9637735 100644 --- a/src/main/java/com/shopify/model/ShopifyDestination.java +++ b/src/main/java/com/shopify/model/ShopifyDestination.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyErrors.java b/src/main/java/com/shopify/model/ShopifyErrors.java index 8fda2a4e..115d7e87 100644 --- a/src/main/java/com/shopify/model/ShopifyErrors.java +++ b/src/main/java/com/shopify/model/ShopifyErrors.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyErrorsRoot.java b/src/main/java/com/shopify/model/ShopifyErrorsRoot.java index 8aeec6b7..d84f599e 100644 --- a/src/main/java/com/shopify/model/ShopifyErrorsRoot.java +++ b/src/main/java/com/shopify/model/ShopifyErrorsRoot.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyErrorsRoot { diff --git a/src/main/java/com/shopify/model/ShopifyFulfillment.java b/src/main/java/com/shopify/model/ShopifyFulfillment.java index ae68a983..d6b1d5b0 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillment.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillment.java @@ -3,16 +3,18 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import lombok.Data; import org.joda.time.DateTime; import com.shopify.model.adapters.DateTimeAdapter; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyFulfillment { @@ -78,100 +80,4 @@ public String toString() { @XmlElement(name = "location_id") private String locationId; - public String getId() { - return id; - } - - public void setId(final String id) { - this.id = id; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(final String orderId) { - this.orderId = orderId; - } - - public String getStatus() { - return status; - } - - public void setStatus(final String status) { - this.status = status; - } - - public DateTime getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(final DateTime createdAt) { - this.createdAt = createdAt; - } - - public DateTime getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(final DateTime updatedAt) { - this.updatedAt = updatedAt; - } - - public String getTrackingCompany() { - return trackingCompany; - } - - public void setTrackingCompany(final String trackingCompany) { - this.trackingCompany = trackingCompany; - } - - public String getTrackingNumber() { - return trackingNumber; - } - - public void setTrackingNumber(final String trackingNumber) { - this.trackingNumber = trackingNumber; - } - - public String getTrackingUrl() { - return trackingUrl; - } - - public void setTrackingUrl(final String trackingUrl) { - this.trackingUrl = trackingUrl; - } - - public List getTrackingUrls() { - return trackingUrls; - } - - public void setTrackingUrls(final List trackingUrls) { - this.trackingUrls = trackingUrls; - } - - public boolean isNotifyCustomer() { - return notifyCustomer; - } - - public void setNotifyCustomer(final boolean notifyCustomer) { - this.notifyCustomer = notifyCustomer; - } - - public List getLineItems() { - return lineItems; - } - - public void setLineItems(final List lineItems) { - this.lineItems = lineItems; - } - - public String getLocationId() { - return locationId; - } - - public void setLocationId(final String locationId) { - this.locationId = locationId; - } - } diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentHold.java b/src/main/java/com/shopify/model/ShopifyFulfillmentHold.java index 4f76d8ab..177e32dc 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentHold.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentHold.java @@ -1,10 +1,12 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import lombok.Data; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyFulfillmentHold { @@ -13,20 +15,4 @@ public class ShopifyFulfillmentHold { @XmlElement(name = "reason_notes") private String reasonNotes; - public String getReason() { - return reason; - } - - public void setReason(String reason) { - this.reason = reason; - } - - public String getReasonNotes() { - return reasonNotes; - } - - public void setReasonNotes(String reasonNotes) { - this.reasonNotes = reasonNotes; - } - } diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrder.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrder.java index 7bdf1c19..ec64e3cb 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrder.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrder.java @@ -3,16 +3,18 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import lombok.Data; import org.joda.time.DateTime; import com.shopify.model.adapters.DateTimeAdapter; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyFulfillmentOrder { @@ -269,150 +271,6 @@ public String toString() { @XmlElement(name = "merchant_requests") private List merchantRequests = new LinkedList<>(); - public String getAssignedLocationId() { - return assignedLocationId; - } - - public void setAssignedLocationId(String assignedLocationId) { - this.assignedLocationId = assignedLocationId; - } - - public ShopifyDestination getDestination() { - return destination; - } - - public void setDestination(ShopifyDestination destination) { - this.destination = destination; - } - - public ShopifyDeliveryMethod getDeliveryMethod() { - return deliveryMethod; - } - - public void setDeliveryMethod(ShopifyDeliveryMethod deliveryMethod) { - this.deliveryMethod = deliveryMethod; - } - - public DateTime getFulfillAt() { - return fulfillAt; - } - - public void setFulfillAt(DateTime fulfillAt) { - this.fulfillAt = fulfillAt; - } - - public DateTime getFulfillBy() { - return fulfillBy; - } - - public void setFulfillBy(DateTime fulfillBy) { - this.fulfillBy = fulfillBy; - } - - public List getFulfillmentHolds() { - return fulfillmentHolds; - } - - public void setFulfillmentHolds(List fulfillmentHolds) { - this.fulfillmentHolds = fulfillmentHolds; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public ShopifyInternationalDuty getInternationalDuties() { - return internationalDuties; - } - - public void setInternationalDuties(ShopifyInternationalDuty internationalDuties) { - this.internationalDuties = internationalDuties; - } - - public List getLineItems() { - return lineItems; - } - - public void setLineItems(List lineItems) { - this.lineItems = lineItems; - } - - public String getOrderId() { - return orderId; - } - - public void setOrderId(String orderId) { - this.orderId = orderId; - } - - public String getRequestStatus() { - return requestStatus; - } - - public void setRequestStatus(String requestStatus) { - this.requestStatus = requestStatus; - } - - public String getShopId() { - return shopId; - } - - public void setShopId(String shopId) { - this.shopId = shopId; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public List getSupportedActions() { - return supportedActions; - } - - public void setSupportedActions(List supportedActions) { - this.supportedActions = supportedActions; - } - - public List getMerchantRequests() { - return merchantRequests; - } - - public void setMerchantRequests(List merchantRequests) { - this.merchantRequests = merchantRequests; - } - - public ShopifyAssignedLocation getAssignedLocation() { - return assignedLocation; - } - - public void setAssignedLocation(ShopifyAssignedLocation assignedLocation) { - this.assignedLocation = assignedLocation; - } - - public DateTime getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(DateTime createdAt) { - this.createdAt = createdAt; - } - - public DateTime getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(DateTime updatedAt) { - this.updatedAt = updatedAt; - } - public boolean hasSupportedAction(final SupportedActions action) { final String stringAction = action.toString().toLowerCase(); for (final String supportedAction : this.getSupportedActions()) { diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderLineItem.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderLineItem.java index 93e88e63..e0595b64 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderLineItem.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderLineItem.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveLocationPayload.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveLocationPayload.java index 3691ef32..5f9f2866 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveLocationPayload.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveLocationPayload.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveRequestRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveRequestRoot.java index a05fc942..a5a3904f 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveRequestRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveRequestRoot.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveResponseRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveResponseRoot.java index 3255db33..f0580f1d 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveResponseRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderMoveResponseRoot.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderPayloadLineItem.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderPayloadLineItem.java index 18e11a20..1aba1357 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderPayloadLineItem.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderPayloadLineItem.java @@ -1,8 +1,8 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderRoot.java index 9711e563..087850d5 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrderRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrderRoot.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentOrdersRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentOrdersRoot.java index 487de546..7f859111 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentOrdersRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentOrdersRoot.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentPayload.java b/src/main/java/com/shopify/model/ShopifyFulfillmentPayload.java index c2ab278e..f0fdacac 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentPayload.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentPayload.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentPayloadRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentPayloadRoot.java index 18f15a6e..559fe629 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentPayloadRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentPayloadRoot.java @@ -1,8 +1,8 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyFulfillmentRoot.java b/src/main/java/com/shopify/model/ShopifyFulfillmentRoot.java index 4128ef44..212cd81f 100644 --- a/src/main/java/com/shopify/model/ShopifyFulfillmentRoot.java +++ b/src/main/java/com/shopify/model/ShopifyFulfillmentRoot.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyFulfillmentRoot { diff --git a/src/main/java/com/shopify/model/ShopifyGiftCard.java b/src/main/java/com/shopify/model/ShopifyGiftCard.java index 4acc0b10..8b81fb56 100644 --- a/src/main/java/com/shopify/model/ShopifyGiftCard.java +++ b/src/main/java/com/shopify/model/ShopifyGiftCard.java @@ -2,11 +2,11 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.joda.time.DateTime; diff --git a/src/main/java/com/shopify/model/ShopifyGiftCardRoot.java b/src/main/java/com/shopify/model/ShopifyGiftCardRoot.java index 160bc5d6..7c12bb80 100644 --- a/src/main/java/com/shopify/model/ShopifyGiftCardRoot.java +++ b/src/main/java/com/shopify/model/ShopifyGiftCardRoot.java @@ -1,7 +1,7 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyGiftCardRoot { diff --git a/src/main/java/com/shopify/model/ShopifyImageRoot.java b/src/main/java/com/shopify/model/ShopifyImageRoot.java index f9114358..14fa411a 100644 --- a/src/main/java/com/shopify/model/ShopifyImageRoot.java +++ b/src/main/java/com/shopify/model/ShopifyImageRoot.java @@ -1,6 +1,6 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyImageRoot { diff --git a/src/main/java/com/shopify/model/ShopifyInternationalDuty.java b/src/main/java/com/shopify/model/ShopifyInternationalDuty.java index 4fc85ca0..354de310 100644 --- a/src/main/java/com/shopify/model/ShopifyInternationalDuty.java +++ b/src/main/java/com/shopify/model/ShopifyInternationalDuty.java @@ -1,9 +1,11 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import lombok.Data; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyInternationalDuty { @@ -49,12 +51,4 @@ public String toString() { private String incoterm; - public String getIncoterm() { - return incoterm; - } - - public void setIncoterm(String incoterm) { - this.incoterm = incoterm; - } - } diff --git a/src/main/java/com/shopify/model/ShopifyInventoryLevel.java b/src/main/java/com/shopify/model/ShopifyInventoryLevel.java index d3a04ddb..3d793001 100644 --- a/src/main/java/com/shopify/model/ShopifyInventoryLevel.java +++ b/src/main/java/com/shopify/model/ShopifyInventoryLevel.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyInventoryLevelRoot.java b/src/main/java/com/shopify/model/ShopifyInventoryLevelRoot.java index 53321bf2..95fb3334 100644 --- a/src/main/java/com/shopify/model/ShopifyInventoryLevelRoot.java +++ b/src/main/java/com/shopify/model/ShopifyInventoryLevelRoot.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyLineItem.java b/src/main/java/com/shopify/model/ShopifyLineItem.java index 61dbfdcb..50b53aa7 100644 --- a/src/main/java/com/shopify/model/ShopifyLineItem.java +++ b/src/main/java/com/shopify/model/ShopifyLineItem.java @@ -4,10 +4,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyLineItemsByFulfillmentOrder.java b/src/main/java/com/shopify/model/ShopifyLineItemsByFulfillmentOrder.java index 05509a75..c6ffad6e 100644 --- a/src/main/java/com/shopify/model/ShopifyLineItemsByFulfillmentOrder.java +++ b/src/main/java/com/shopify/model/ShopifyLineItemsByFulfillmentOrder.java @@ -3,10 +3,10 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyLocation.java b/src/main/java/com/shopify/model/ShopifyLocation.java index ceee8e85..27955bcf 100644 --- a/src/main/java/com/shopify/model/ShopifyLocation.java +++ b/src/main/java/com/shopify/model/ShopifyLocation.java @@ -1,9 +1,9 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyLocationsRoot.java b/src/main/java/com/shopify/model/ShopifyLocationsRoot.java index f64d1145..9aa362d4 100644 --- a/src/main/java/com/shopify/model/ShopifyLocationsRoot.java +++ b/src/main/java/com/shopify/model/ShopifyLocationsRoot.java @@ -3,7 +3,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyLocationsRoot { diff --git a/src/main/java/com/shopify/model/ShopifyMerchandRequest.java b/src/main/java/com/shopify/model/ShopifyMerchandRequest.java index 4b8c27ac..6cae67e6 100644 --- a/src/main/java/com/shopify/model/ShopifyMerchandRequest.java +++ b/src/main/java/com/shopify/model/ShopifyMerchandRequest.java @@ -1,10 +1,12 @@ package com.shopify.model; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import lombok.Data; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyMerchandRequest { @@ -44,28 +46,4 @@ public String toString() { private String requestOptions; private String kind; - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public String getRequestOptions() { - return requestOptions; - } - - public void setRequestOptions(String requestOptions) { - this.requestOptions = requestOptions; - } - - public String getKind() { - return kind; - } - - public void setKind(String kind) { - this.kind = kind; - } - } diff --git a/src/main/java/com/shopify/model/ShopifyOrder.java b/src/main/java/com/shopify/model/ShopifyOrder.java index 077039af..26ba4d75 100644 --- a/src/main/java/com/shopify/model/ShopifyOrder.java +++ b/src/main/java/com/shopify/model/ShopifyOrder.java @@ -5,17 +5,19 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import lombok.Data; import org.joda.time.DateTime; import com.shopify.model.adapters.CurrencyAdapter; import com.shopify.model.adapters.DateTimeAdapter; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyOrder { @@ -105,355 +107,4 @@ public class ShopifyOrder { private List refunds = new LinkedList<>(); private List metafields = new LinkedList<>(); - public String getId() { - return id; - } - - public void setId(final String id) { - this.id = id; - } - - public String getEmail() { - return email; - } - - public void setEmail(final String email) { - this.email = email; - } - - public DateTime getClosedAt() { - return closedAt; - } - - public void setClosedAt(final DateTime closedAt) { - this.closedAt = closedAt; - } - - public DateTime getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(final DateTime createdAt) { - this.createdAt = createdAt; - } - - public DateTime getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(final DateTime updatedAt) { - this.updatedAt = updatedAt; - } - - public int getNumber() { - return number; - } - - public void setNumber(final int number) { - this.number = number; - } - - public String getNote() { - return note; - } - - public void setNote(final String note) { - this.note = note; - } - - public String getToken() { - return token; - } - - public void setToken(final String token) { - this.token = token; - } - - public BigDecimal getTotalPrice() { - return totalPrice; - } - - public void setTotalPrice(final BigDecimal totalPrice) { - this.totalPrice = totalPrice; - } - - public BigDecimal getSubtotalPrice() { - return subtotalPrice; - } - - public void setSubtotalPrice(final BigDecimal subtotalPrice) { - this.subtotalPrice = subtotalPrice; - } - - public long getTotalWeight() { - return totalWeight; - } - - public void setTotalWeight(final long totalWeight) { - this.totalWeight = totalWeight; - } - - public BigDecimal getTotalTax() { - return totalTax; - } - - public void setTotalTax(final BigDecimal totalTax) { - this.totalTax = totalTax; - } - - public boolean isTaxesIncluded() { - return taxesIncluded; - } - - public void setTaxesIncluded(final boolean taxesIncluded) { - this.taxesIncluded = taxesIncluded; - } - - public Currency getCurrency() { - return currency; - } - - public void setCurrency(final Currency currency) { - this.currency = currency; - } - - public String getFinancialStatus() { - return financialStatus; - } - - public void setFinancialStatus(final String financialStatus) { - this.financialStatus = financialStatus; - } - - public BigDecimal getTotalDiscounts() { - return totalDiscounts; - } - - public void setTotalDiscounts(final BigDecimal totalDiscounts) { - this.totalDiscounts = totalDiscounts; - } - - public BigDecimal getTotaLineItemsPrice() { - return totaLineItemsPrice; - } - - public void setTotaLineItemsPrice(final BigDecimal totaLineItemsPrice) { - this.totaLineItemsPrice = totaLineItemsPrice; - } - - public String getCartToken() { - return cartToken; - } - - public void setCartToken(final String cartToken) { - this.cartToken = cartToken; - } - - public boolean isBuyerAcceptsMarketing() { - return buyerAcceptsMarketing; - } - - public void setBuyerAcceptsMarketing(final boolean buyerAcceptsMarketing) { - this.buyerAcceptsMarketing = buyerAcceptsMarketing; - } - - public String getName() { - return name; - } - - public void setName(final String name) { - this.name = name; - } - - public String getReferringSite() { - return referringSite; - } - - public void setReferringSite(final String referringSite) { - this.referringSite = referringSite; - } - - public String getLandingSite() { - return landingSite; - } - - public void setLandingSite(final String landingSite) { - this.landingSite = landingSite; - } - - public DateTime getCancelledAt() { - return cancelledAt; - } - - public void setCancelledAt(final DateTime cancelledAt) { - this.cancelledAt = cancelledAt; - } - - public String getCancelReason() { - return cancelReason; - } - - public void setCancelReason(final String cancelReason) { - this.cancelReason = cancelReason; - } - - public String getUserId() { - return userId; - } - - public void setUserId(final String userId) { - this.userId = userId; - } - - public String getLocationId() { - return locationId; - } - - public void setLocationId(final String locationId) { - this.locationId = locationId; - } - - public DateTime getProcessedAt() { - return processedAt; - } - - public void setProcessedAt(final DateTime processedAt) { - this.processedAt = processedAt; - } - - public String getBrowserIp() { - return browserIp; - } - - public void setBrowserIp(final String browserIp) { - this.browserIp = browserIp; - } - - public String getOrderNumber() { - return orderNumber; - } - - public void setOrderNumber(final String orderNumber) { - this.orderNumber = orderNumber; - } - - public String getProcessingMethod() { - return processingMethod; - } - - public void setProcessingMethod(final String processingMethod) { - this.processingMethod = processingMethod; - } - - public String getSourceName() { - return sourceName; - } - - public void setSourceName(final String sourceName) { - this.sourceName = sourceName; - } - - public String getFulfillmentStatus() { - return fulfillmentStatus; - } - - public void setFulfillmentStatus(final String fulfillmentStatus) { - this.fulfillmentStatus = fulfillmentStatus; - } - - public String getTags() { - return tags; - } - - public void setTags(final String tags) { - this.tags = tags; - } - - public String getOrderStatusUrl() { - return orderStatusUrl; - } - - public void setOrderStatusUrl(final String orderStatusUrl) { - this.orderStatusUrl = orderStatusUrl; - } - - public List getLineItems() { - return lineItems; - } - - public void setLineItems(final List lineItems) { - this.lineItems = lineItems; - } - - public List getFulfillments() { - return fulfillments; - } - - public void setFulfillments(final List fulfillments) { - this.fulfillments = fulfillments; - } - - public ShopifyAddress getBillingAddress() { - return billingAddress; - } - - public void setBillingAddress(final ShopifyAddress billingAddress) { - this.billingAddress = billingAddress; - } - - public ShopifyAddress getShippingAddress() { - return shippingAddress; - } - - public void setShippingAddress(final ShopifyAddress shippingAddress) { - this.shippingAddress = shippingAddress; - } - - public ShopifyCustomer getCustomer() { - return customer; - } - - public void setCustomer(final ShopifyCustomer customer) { - this.customer = customer; - } - - public List getShippingLines() { - return shippingLines; - } - - public void setShippingLines(final List shippingLines) { - this.shippingLines = shippingLines; - } - - public List getTaxLines() { - return taxLines; - } - - public void setTaxLines(final List taxLines) { - this.taxLines = taxLines; - } - - public List getNoteAttributes() { - return noteAttributes; - } - - public void setNoteAttributes(final List noteAttributes) { - this.noteAttributes = noteAttributes; - } - - public List getMetafields() { - return metafields; - } - - public void setMetafields(final List metafields) { - this.metafields = metafields; - } - - public List getRefunds() { - return refunds; - } - - public void setRefunds(final List refunds) { - this.refunds = refunds; - } } diff --git a/src/main/java/com/shopify/model/ShopifyOrderRisk.java b/src/main/java/com/shopify/model/ShopifyOrderRisk.java index ba014f0d..9a52a5c0 100644 --- a/src/main/java/com/shopify/model/ShopifyOrderRisk.java +++ b/src/main/java/com/shopify/model/ShopifyOrderRisk.java @@ -2,9 +2,9 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.shopify.model.adapters.OrderRiskRecommendationAdapter; diff --git a/src/main/java/com/shopify/model/ShopifyOrderRisksRoot.java b/src/main/java/com/shopify/model/ShopifyOrderRisksRoot.java index 8e5b797f..e75890be 100644 --- a/src/main/java/com/shopify/model/ShopifyOrderRisksRoot.java +++ b/src/main/java/com/shopify/model/ShopifyOrderRisksRoot.java @@ -3,7 +3,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyOrderRisksRoot { diff --git a/src/main/java/com/shopify/model/ShopifyOrderShippingAddressUpdateRequest.java b/src/main/java/com/shopify/model/ShopifyOrderShippingAddressUpdateRequest.java index d9624fce..70d9401d 100644 --- a/src/main/java/com/shopify/model/ShopifyOrderShippingAddressUpdateRequest.java +++ b/src/main/java/com/shopify/model/ShopifyOrderShippingAddressUpdateRequest.java @@ -2,10 +2,10 @@ import java.math.BigDecimal; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/com/shopify/model/ShopifyOrdersRoot.java b/src/main/java/com/shopify/model/ShopifyOrdersRoot.java index 7c5776cb..e28d2397 100644 --- a/src/main/java/com/shopify/model/ShopifyOrdersRoot.java +++ b/src/main/java/com/shopify/model/ShopifyOrdersRoot.java @@ -3,7 +3,7 @@ import java.util.LinkedList; import java.util.List; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement public class ShopifyOrdersRoot { diff --git a/src/main/java/com/shopify/model/ShopifyProduct.java b/src/main/java/com/shopify/model/ShopifyProduct.java index a026395c..f135ddc8 100644 --- a/src/main/java/com/shopify/model/ShopifyProduct.java +++ b/src/main/java/com/shopify/model/ShopifyProduct.java @@ -7,17 +7,19 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import lombok.Data; import org.apache.commons.lang3.StringUtils; import com.shopify.model.adapters.EscapedStringAdapter; import com.shopify.model.adapters.TagsAdapter; +@Data @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class ShopifyProduct { @@ -47,118 +49,10 @@ public class ShopifyProduct { private String publishedAt; private Boolean published; - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getProductType() { - return productType; - } - - public void setProductType(String productType) { - this.productType = productType; - } - - public String getBodyHtml() { - return bodyHtml; - } - - public void setBodyHtml(String bodyHtml) { - this.bodyHtml = bodyHtml; - } - - public String getVendor() { - return vendor; - } - - public void setVendor(String vendor) { - this.vendor = vendor; - } - - public Set getTags() { - return tags; - } - - public void setTags(Set tags) { - this.tags = tags; - } - - public List