summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java132
-rw-r--r--openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java194
-rw-r--r--openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyInputStream.java46
-rw-r--r--openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java2
4 files changed, 187 insertions, 187 deletions
diff --git a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
index 2ec564c..22ba5e4 100644
--- a/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
+++ b/openstack-client-connectors/jersey2-connector/src/main/java/com/woorea/openstack/connector/OpenStack.java
@@ -35,21 +35,21 @@ import org.glassfish.jersey.jackson.JacksonFeature;
public class OpenStack {
- public static Client CLIENT;
-
- public static ObjectMapper DEFAULT_MAPPER;
-
- public static ObjectMapper WRAPPED_MAPPER;
-
- static {
- initialize();
- }
-
- private static void initialize() {
-
- /*
- //class MyX509TrustManager implements X509TrustManager
- TrustManager mytm[] = null;
+ public static Client CLIENT;
+
+ public static ObjectMapper DEFAULT_MAPPER;
+
+ public static ObjectMapper WRAPPED_MAPPER;
+
+ static {
+ initialize();
+ }
+
+ private static void initialize() {
+
+ /*
+ //class MyX509TrustManager implements X509TrustManager
+ TrustManager mytm[] = null;
KeyManager mykm[] = null;
try {
@@ -58,71 +58,71 @@ public class OpenStack {
} catch (Exception ex) {
}
-
- SSLContext context = null;
+
+ SSLContext context = null;
context = SSLContext.getInstance("SSL");
context.init(mykm, mytm, null);
-
- */
-
- try {
-
- SSLContext context;
+
+ */
+
+ try {
+
+ SSLContext context;
context = SSLContext.getInstance("SSL");
context.init(null, null, null);
SslConfigurator sslConfig = SslConfigurator.newInstance();
- /*
+ /*
.trustStoreFile("./truststore_client")
.trustStorePassword("asdfgh")
.keyStoreFile("./keystore_client")
.keyPassword("asdfgh");
*/
- //old: CLIENT.property(ClientProperties.SSL_CONFIG, new SslConfig(context));
+ //old: CLIENT.property(ClientProperties.SSL_CONFIG, new SslConfig(context));
CLIENT = ClientBuilder.newBuilder().sslContext(sslConfig.createSSLContext()).build();
-
- DEFAULT_MAPPER = new ObjectMapper();
-
- DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
- DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
- DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
- DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
- DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-
- WRAPPED_MAPPER = new ObjectMapper();
-
- WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
- WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
- WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
- WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-
- CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
+
+ DEFAULT_MAPPER = new ObjectMapper();
+
+ DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+ DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+ DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+ DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
+ WRAPPED_MAPPER = new ObjectMapper();
+
+ WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+ WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+ WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
+ CLIENT.register(new JacksonFeature()).register(new ContextResolver<ObjectMapper>() {
- @Override
- public ObjectMapper getContext(Class<?> type) {
- return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
- }
-
- });
-
- CLIENT.register(new ClientRequestFilter() {
-
- @Override
- public void filter(ClientRequestContext requestContext) throws IOException {
- requestContext.getHeaders().remove("Content-Language");
- requestContext.getHeaders().remove("Content-Encoding");
- }
- });
-
- } catch(Exception e) {
- throw new RuntimeException(e.getMessage(), e);
- }
-
- }
+ @Override
+ public ObjectMapper getContext(Class<?> type) {
+ return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
+ }
+
+ });
+
+ CLIENT.register(new ClientRequestFilter() {
+
+ @Override
+ public void filter(ClientRequestContext requestContext) throws IOException {
+ requestContext.getHeaders().remove("Content-Language");
+ requestContext.getHeaders().remove("Content-Encoding");
+ }
+ });
+
+ } catch(Exception e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+
+ }
}
diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
index e613ad2..1f9c0de 100644
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyConnector.java
@@ -44,102 +44,102 @@ import com.woorea.openstack.base.client.OpenStackResponseException;
public class RESTEasyConnector implements OpenStackClientConnector {
- public static ObjectMapper DEFAULT_MAPPER;
-
- public static ObjectMapper WRAPPED_MAPPER;
-
- static class OpenStackProviderFactory extends ResteasyProviderFactory {
-
- private JacksonJsonProvider jsonProvider;
- private InputStreamProvider streamProvider;
-
- public OpenStackProviderFactory() {
- super();
-
- addContextResolver(new ContextResolver<ObjectMapper>() {
- @Override
- public ObjectMapper getContext(Class<?> type) {
- return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
- }
- });
-
- jsonProvider = new JacksonJsonProvider();
- addMessageBodyReader(jsonProvider);
- addMessageBodyWriter(jsonProvider);
-
- streamProvider = new InputStreamProvider();
- addMessageBodyReader(streamProvider);
- addMessageBodyWriter(streamProvider);
- }
-
- }
-
- private static OpenStackProviderFactory providerFactory;
-
- static {
- DEFAULT_MAPPER = new ObjectMapper();
-
- DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
- DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
- DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
- DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
- DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-
- WRAPPED_MAPPER = new ObjectMapper();
-
- WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
- WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
- WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
- WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
- WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
-
- providerFactory = new OpenStackProviderFactory();
- }
-
- @Override
- public <T> OpenStackResponse request(OpenStackRequest<T> request) {
- ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()),
- ClientRequest.getDefaultExecutor(), providerFactory);
-
- for(Map.Entry<String, List<Object> > entry : request.queryParams().entrySet()) {
- for (Object o : entry.getValue()) {
- client = client.queryParameter(entry.getKey(), String.valueOf(o));
- }
- }
-
- for (Entry<String, List<Object>> h : request.headers().entrySet()) {
- StringBuilder sb = new StringBuilder();
- for (Object v : h.getValue()) {
- sb.append(String.valueOf(v));
- }
- client.header(h.getKey(), sb);
- }
-
- if (request.entity() != null) {
- client.body(request.entity().getContentType(), request.entity().getEntity());
- }
-
- ClientResponse<T> response;
-
- try {
- response = client.httpMethod(request.method().name(), request.returnType());
- } catch (Exception e) {
- throw new RuntimeException("Unexpected client exception", e);
- }
-
- if (response.getStatus() == HttpStatus.SC_OK
- || response.getStatus() == HttpStatus.SC_CREATED
- || response.getStatus() == HttpStatus.SC_NO_CONTENT
- || response.getStatus() == HttpStatus.SC_ACCEPTED) {
- return new RESTEasyResponse(client, response);
- }
-
- response.releaseConnection();
-
- throw new OpenStackResponseException(response.getResponseStatus()
- .getReasonPhrase(), response.getStatus());
- }
+ public static ObjectMapper DEFAULT_MAPPER;
+
+ public static ObjectMapper WRAPPED_MAPPER;
+
+ static class OpenStackProviderFactory extends ResteasyProviderFactory {
+
+ private JacksonJsonProvider jsonProvider;
+ private InputStreamProvider streamProvider;
+
+ public OpenStackProviderFactory() {
+ super();
+
+ addContextResolver(new ContextResolver<ObjectMapper>() {
+ @Override
+ public ObjectMapper getContext(Class<?> type) {
+ return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
+ }
+ });
+
+ jsonProvider = new JacksonJsonProvider();
+ addMessageBodyReader(jsonProvider);
+ addMessageBodyWriter(jsonProvider);
+
+ streamProvider = new InputStreamProvider();
+ addMessageBodyReader(streamProvider);
+ addMessageBodyWriter(streamProvider);
+ }
+
+ }
+
+ private static OpenStackProviderFactory providerFactory;
+
+ static {
+ DEFAULT_MAPPER = new ObjectMapper();
+
+ DEFAULT_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+ DEFAULT_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+ DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ DEFAULT_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+ DEFAULT_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
+ WRAPPED_MAPPER = new ObjectMapper();
+
+ WRAPPED_MAPPER.setSerializationInclusion(Inclusion.NON_NULL);
+ WRAPPED_MAPPER.enable(SerializationConfig.Feature.INDENT_OUTPUT);
+ WRAPPED_MAPPER.enable(SerializationConfig.Feature.WRAP_ROOT_VALUE);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+ WRAPPED_MAPPER.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
+
+ providerFactory = new OpenStackProviderFactory();
+ }
+
+ @Override
+ public <T> OpenStackResponse request(OpenStackRequest<T> request) {
+ ClientRequest client = new ClientRequest(UriBuilder.fromUri(request.endpoint() + "/" + request.path()),
+ ClientRequest.getDefaultExecutor(), providerFactory);
+
+ for(Map.Entry<String, List<Object> > entry : request.queryParams().entrySet()) {
+ for (Object o : entry.getValue()) {
+ client = client.queryParameter(entry.getKey(), String.valueOf(o));
+ }
+ }
+
+ for (Entry<String, List<Object>> h : request.headers().entrySet()) {
+ StringBuilder sb = new StringBuilder();
+ for (Object v : h.getValue()) {
+ sb.append(String.valueOf(v));
+ }
+ client.header(h.getKey(), sb);
+ }
+
+ if (request.entity() != null) {
+ client.body(request.entity().getContentType(), request.entity().getEntity());
+ }
+
+ ClientResponse<T> response;
+
+ try {
+ response = client.httpMethod(request.method().name(), request.returnType());
+ } catch (Exception e) {
+ throw new RuntimeException("Unexpected client exception", e);
+ }
+
+ if (response.getStatus() == HttpStatus.SC_OK
+ || response.getStatus() == HttpStatus.SC_CREATED
+ || response.getStatus() == HttpStatus.SC_NO_CONTENT
+ || response.getStatus() == HttpStatus.SC_ACCEPTED) {
+ return new RESTEasyResponse(client, response);
+ }
+
+ response.releaseConnection();
+
+ throw new OpenStackResponseException(response.getResponseStatus()
+ .getReasonPhrase(), response.getStatus());
+ }
}
diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyInputStream.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyInputStream.java
index 0976ef6..0e1e9e9 100644
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyInputStream.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyInputStream.java
@@ -26,28 +26,28 @@ import org.jboss.resteasy.client.ClientExecutor;
public class RESTEasyInputStream extends FilterInputStream {
- protected ClientExecutor clientExecutor;
-
- public RESTEasyInputStream(InputStream inputStream, ClientExecutor clientExecutor) {
- super(inputStream);
- this.clientExecutor = clientExecutor;
- }
-
- @Override
- public void close() throws IOException {
- try {
- clientExecutor.close();
- } catch (Exception e) {
- // Silently skip errors in the socket close errors
- }
-
- try {
- super.close();
- } catch (SocketException e) {
- // We expect this exception because the socket is closed
- } catch (IllegalStateException e) {
- // We expect this exception because the socket is closed (httpclient 4.2)
- }
- }
+ protected ClientExecutor clientExecutor;
+
+ public RESTEasyInputStream(InputStream inputStream, ClientExecutor clientExecutor) {
+ super(inputStream);
+ this.clientExecutor = clientExecutor;
+ }
+
+ @Override
+ public void close() throws IOException {
+ try {
+ clientExecutor.close();
+ } catch (Exception e) {
+ // Silently skip errors in the socket close errors
+ }
+
+ try {
+ super.close();
+ } catch (SocketException e) {
+ // We expect this exception because the socket is closed
+ } catch (IllegalStateException e) {
+ // We expect this exception because the socket is closed (httpclient 4.2)
+ }
+ }
}
diff --git a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
index 344317f..ced748e 100644
--- a/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
+++ b/openstack-client-connectors/resteasy-connector/src/main/java/com/woorea/openstack/connector/RESTEasyResponse.java
@@ -52,7 +52,7 @@ public class RESTEasyResponse implements OpenStackResponse {
@Override
public InputStream getInputStream() {
- return new RESTEasyInputStream((InputStream) response.getEntity(InputStream.class), client.getExecutor());
+ return new RESTEasyInputStream((InputStream) response.getEntity(InputStream.class), client.getExecutor());
}
@Override