Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add theme apis and delete charge api #129

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@
<java.version>1.8</java.version>
<junit.version>4.13.1</junit.version>
<slf4j.version>1.7.22</slf4j.version>
<jersey.version>2.25.1</jersey.version>
<jersey.version>2.33</jersey.version>
<pitest.version>1.4.3</pitest.version>
<jacoco.version>0.8.2</jacoco.version>
</properties>
@@ -74,10 +74,15 @@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
<artifactId>jersey-hk2</artifactId>
<version>${jersey.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>2.4.0</version>
<version>2.12.1</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.media</groupId>
7 changes: 2 additions & 5 deletions src/main/java/com/shopify/ShopifySdk.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.shopify;

import com.shopify.mappers.ObjectMapperProvider;
import com.shopify.model.ShopifyAssertsRoot;
import com.shopify.model.ShopifyAsset;
import com.shopify.model.ShopifyAssetRoot;
@@ -1241,11 +1242,7 @@ private WebTarget getWebTarget() {
}

private static Client buildClient() {
final ObjectMapper mapper = ShopifySdkObjectMapper.buildMapper();
final JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider();
provider.setMapper(mapper);

return ClientBuilder.newClient().register(JacksonFeature.class).register(provider);
return ClientBuilder.newClient().register(JacksonFeature.class).register(ObjectMapperProvider.class);
}

public class ShopifySdkRetryListener implements RetryListener {
19 changes: 19 additions & 0 deletions src/main/java/com/shopify/mappers/ObjectMapperProvider.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.shopify.mappers;

import com.fasterxml.jackson.databind.ObjectMapper;
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;

@Provider
public class ObjectMapperProvider implements ContextResolver<ObjectMapper> {
private final ObjectMapper objectMapper;

public ObjectMapperProvider() {
objectMapper = ShopifySdkObjectMapper.buildMapper();
}

@Override
public ObjectMapper getContext(Class<?> aClass) {
return objectMapper;
}
}