Skip to content

Commit a0358e1

Browse files
wooreawoorea
committed
jersey version bugs
1 parent d9da302 commit a0358e1

8 files changed

Lines changed: 15 additions & 16 deletions

File tree

‎ceilometer-java/ceilometer-client/src/main/java/org/openstack/ceilometer/CeilometerClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public CeilometerClient(String endpointURL, String token) {
1414
public <R> R execute(CeilometerCommand<R> command) {
1515
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
1616
if(token != null) {
17-
endpoint.configuration().register(tokenFilter);
17+
endpoint.register(tokenFilter);
1818
}
1919
return command.execute(endpoint);
2020
}

‎glance-client/src/main/java/org/openstack/glance/GlanceClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public GlanceClient(String endpointURL, String token) {
1414
public <R> R execute(GlanceCommand<R> command) {
1515
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
1616
if(token != null) {
17-
endpoint.configuration().register(tokenFilter);
17+
endpoint.register(tokenFilter);
1818
}
1919
return command.execute(endpoint);
2020
}

‎keystone-client/src/main/java/org/openstack/keystone/KeystoneClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public KeystoneClient(String endpointURL) {
1818
public <R> R execute(KeystoneCommand<R> command) {
1919
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
2020
if(token != null) {
21-
endpoint.configuration().register(tokenFilter);
21+
endpoint.register(tokenFilter);
2222
}
2323
return command.execute(endpoint);
2424
}

‎nova-client/src/main/java/org/openstack/nova/NovaClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public NovaClient(String endpointURL, String token) {
1414
public <R> R execute(NovaCommand<R> command) {
1515
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
1616
if(token != null) {
17-
endpoint.configuration().register(tokenFilter);
17+
endpoint.register(tokenFilter);
1818
}
1919
return command.execute(endpoint);
2020
}

‎openstack-client/src/main/java/org/openstack/OpenStack.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static void initialize() {
5959
SSLContext context = null;
6060
context = SSLContext.getInstance("SSL");
6161
context.init(null, null, null);
62-
CLIENT.configuration().setProperty(ClientProperties.SSL_CONFIG, new SslConfig(context));
62+
CLIENT.setProperty(ClientProperties.SSL_CONFIG, new SslConfig(context));
6363

6464
DEFAULT_MAPPER = new ObjectMapper();
6565

@@ -75,23 +75,23 @@ private static void initialize() {
7575
WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
7676
WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
7777

78-
CLIENT.configuration().register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
78+
CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
7979

8080
public ObjectMapper getContext(Class<?> type) {
8181
return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
8282
}
8383

8484
});
8585

86-
CLIENT.configuration().register(new ClientRequestFilter() {
86+
CLIENT.register(new ClientRequestFilter() {
8787

8888
public void filter(ClientRequestContext requestContext) throws IOException {
8989
requestContext.getHeaders().remove("Content-Language");
9090
requestContext.getHeaders().remove("Content-Encoding");
9191
}
9292
});
9393

94-
CLIENT.configuration().register(new LoggingFilter(Logger.getLogger("openstack"), true));
94+
CLIENT.register(new LoggingFilter(Logger.getLogger("openstack"), true));
9595
} catch(Exception e) {
9696
throw new RuntimeException(e.getMessage(), e);
9797
}

‎openstack-client/src/main/java/org/openstack/common/client/AbstractOpenStackClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void setToken(String token) {
4444
public OpenStackRequest request(String uri, String... mediaTypes) {
4545
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
4646
if(token != null) {
47-
endpoint.configuration().register(tokenFilter);
47+
endpoint.register(tokenFilter);
4848
}
4949
return new OpenStackRequest(endpoint.path(uri).request(mediaTypes));
5050
}

‎openstack-examples/src/main/java/org/openstack/examples/objectstore/SwiftExample.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.openstack.keystone.utils.KeystoneUtils;
1313
import org.openstack.swift.SwiftClient;
1414
import org.openstack.swift.api.CreateContainer;
15-
import org.openstack.swift.api.DeleteContainer;
1615
import org.openstack.swift.api.ListContainers;
1716
import org.openstack.swift.api.ListObjects;
1817
import org.openstack.swift.api.UploadObject;
@@ -48,19 +47,19 @@ public static void main(String[] args) throws Exception {
4847

4948
SwiftClient swiftClient = new SwiftClient(KeystoneUtils.findEndpointURL(access.getServiceCatalog(), "object-store", null, "public"), access.getToken().getId());
5049

51-
swiftClient.execute(new DeleteContainer("navidad"));
50+
//swiftClient.execute(new DeleteContainer("navidad2"));
5251

53-
swiftClient.execute(new CreateContainer("navidad"));
52+
swiftClient.execute(new CreateContainer("navidad2"));
5453

5554
System.out.println(swiftClient.execute(new ListContainers()));
5655

5756
ObjectForUpload upload = new ObjectForUpload();
58-
upload.setContainer("navidad");
59-
upload.setName("example");
57+
upload.setContainer("navidad2");
58+
upload.setName("example2");
6059
upload.setInputStream(new FileInputStream(TEST_FILE));
6160
swiftClient.execute(new UploadObject(upload));
6261

63-
System.out.println(swiftClient.execute(new ListObjects("navidad", new HashMap<String, String>() {{
62+
System.out.println(swiftClient.execute(new ListObjects("navidad2", new HashMap<String, String>() {{
6463
put("path", "");
6564
}})).get(0).getContentType());
6665

‎swift-client/src/main/java/org/openstack/swift/SwiftClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public SwiftClient(String endpointURL, String token) {
1414
public <R> R execute(SwiftCommand<R> command) {
1515
WebTarget endpoint = OpenStack.CLIENT.target(endpointURL);
1616
if(token != null) {
17-
endpoint.configuration().register(tokenFilter);
17+
endpoint.register(tokenFilter);
1818
}
1919
return command.execute(endpoint);
2020
}

0 commit comments

Comments
 (0)