Skip to content

Commit 5ec31f9

Browse files
benn-csbenn-cs
committed
fixed compilation errors due to new jersey build
changed the <jaxrs.api.version> from 2.0-m12 to 2.0-m15 Signed-off-by: benn-cs <benn.cs@fengruyi.com>
1 parent b25272b commit 5ec31f9

8 files changed

Lines changed: 13 additions & 13 deletions

File tree

‎ceilometer-java/ceilometer-api/src/main/java/org/openstack/ceilometer/api/Main.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ public static void main(String[] args) throws Exception {
3535

3636
ResourceConfig config = new ResourceConfig()
3737
//.packages("org.openstack.ceilometer.api")
38-
.addClasses(CeilometerApiV1.class)
39-
.addBinders(new JsonJacksonBinder())
40-
.addBinders(mongoDbBinder);
38+
.registerClasses(CeilometerApiV1.class)
39+
.registerInstances(new JsonJacksonBinder())
40+
.registerInstances(mongoDbBinder);
4141
//.addModules(new JsonJacksonModule())
4242
//.addSingletons(api);
4343

‎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
}

‎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)