[openstack-java-sdk] update to openstack-java-sdk-3.0.0-2
Federico Simoncelli
fsimonce at fedoraproject.org
Thu Aug 29 15:13:26 UTC 2013
commit c140e0f8ec9ffdcf0e4a1bbf1ffca89255e825e5
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Thu Aug 29 17:12:12 2013 +0200
update to openstack-java-sdk-3.0.0-2
- resteasy: add support for resteasy 3
0001-resteasy-add-support-for-resteasy-3.patch | 126 ++++++++++++++++++++++++
openstack-java-sdk.spec | 10 ++-
2 files changed, 135 insertions(+), 1 deletions(-)
---
diff --git a/0001-resteasy-add-support-for-resteasy-3.patch b/0001-resteasy-add-support-for-resteasy-3.patch
new file mode 100644
index 0000000..336add2
--- /dev/null
+++ b/0001-resteasy-add-support-for-resteasy-3.patch
@@ -0,0 +1,126 @@
+From 003a13f4217c25c46a07acecc559dcb80eb49004 Mon Sep 17 00:00:00 2001
+From: Federico Simoncelli <fsimonce at redhat.com>
+Date: Thu, 29 Aug 2013 16:44:36 +0200
+Subject: [PATCH] resteasy: add support for resteasy 3
+
+Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
+---
+ .../resteasy-connector/pom.xml | 5 +++
+ .../openstack/connector/RESTEasyConnector.java | 43 ++++++++++++++--------
+ .../openstack/connector/RESTEasyResponse.java | 9 ++---
+ 3 files changed, 35 insertions(+), 22 deletions(-)
+
+diff --git a/openstack-client-connectors/resteasy-connector/pom.xml b/openstack-client-connectors/resteasy-connector/pom.xml
+index 3aec371..6cbea9d 100644
+--- a/openstack-client-connectors/resteasy-connector/pom.xml
++++ b/openstack-client-connectors/resteasy-connector/pom.xml
+@@ -19,5 +19,10 @@
+ <artifactId>jackson-jaxrs</artifactId>
+ <version>1.9.4</version>
+ </dependency>
++ <dependency>
++ <groupId>commons-httpclient</groupId>
++ <artifactId>commons-httpclient</artifactId>
++ <version>3.1</version>
++ </dependency>
+ </dependencies>
+ </project>
+\ No newline at end of file
+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 040f610..25f146e 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
+@@ -15,7 +15,6 @@ import org.codehaus.jackson.map.SerializationConfig;
+ import org.codehaus.jackson.map.annotate.JsonRootName;
+ import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion;
+ import org.jboss.resteasy.client.ClientRequest;
+-import org.jboss.resteasy.client.ClientRequestFactory;
+ import org.jboss.resteasy.client.ClientResponse;
+ import org.jboss.resteasy.plugins.providers.InputStreamProvider;
+ import org.jboss.resteasy.spi.ResteasyProviderFactory;
+@@ -31,7 +30,32 @@ public class RESTEasyConnector implements OpenStackClientConnector {
+
+ public static ObjectMapper WRAPPED_MAPPER;
+
+- private static ResteasyProviderFactory providerFactory;
++ static class OpenStackProviderFactory extends ResteasyProviderFactory {
++
++ private JacksonJsonProvider jsonProvider;
++ private InputStreamProvider streamProvider;
++
++ public OpenStackProviderFactory() {
++ super();
++
++ addContextResolver(new ContextResolver<ObjectMapper>() {
++ 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();
+@@ -48,20 +72,7 @@ public class RESTEasyConnector implements OpenStackClientConnector {
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.UNWRAP_ROOT_VALUE);
+ WRAPPED_MAPPER.enable(DeserializationConfig.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY);
+
+- providerFactory = new ResteasyProviderFactory();
+- providerFactory.addContextResolver(new ContextResolver<ObjectMapper>() {
+- public ObjectMapper getContext(Class<?> type) {
+- return type.getAnnotation(JsonRootName.class) == null ? DEFAULT_MAPPER : WRAPPED_MAPPER;
+- }
+- });
+-
+- JacksonJsonProvider jsonProvider = new JacksonJsonProvider();
+- providerFactory.addMessageBodyReader(jsonProvider);
+- providerFactory.addMessageBodyWriter(jsonProvider);
+-
+- InputStreamProvider streamProvider = new InputStreamProvider();
+- providerFactory.addMessageBodyReader(streamProvider);
+- providerFactory.addMessageBodyWriter(streamProvider);
++ providerFactory = new OpenStackProviderFactory();
+ }
+
+ public <T> OpenStackResponse request(OpenStackRequest<T> request) {
+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 9b7b41e..e6907d2 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
+@@ -28,19 +28,16 @@ public class RESTEasyResponse implements OpenStackResponse {
+
+ @Override
+ public String header(String name) {
+- @SuppressWarnings("unchecked")
+- MultivaluedMap<String, String> responseHeaders = response.getHeaders();
+- return responseHeaders.getFirst(name);
++ return response.getHeaders().getFirst(name).toString();
+ }
+
+ @Override
+ public Map<String, String> headers() {
+ Map<String, String> headers = new HashMap<String, String>();
++ MultivaluedMap<String, Object> responseHeaders = response.getHeaders();
+
+- @SuppressWarnings("unchecked")
+- MultivaluedMap<String, String> responseHeaders = response.getHeaders();
+ for (String key : responseHeaders.keySet()) {
+- headers.put(key, responseHeaders.getFirst(key));
++ headers.put(key, responseHeaders.getFirst(key).toString());
+ }
+
+ return headers;
+--
+1.8.3.1
+
diff --git a/openstack-java-sdk.spec b/openstack-java-sdk.spec
index 2d34f85..40fc497 100644
--- a/openstack-java-sdk.spec
+++ b/openstack-java-sdk.spec
@@ -2,7 +2,7 @@
Name: openstack-java-sdk
Version: 3.0.0
-Release: 1%{?git_hash}%{?dist}
+Release: 2%{?git_hash}%{?dist}
Summary: OpenStack Java SDK
Group: Development/Libraries
@@ -12,6 +12,8 @@ URL: https://github.com/woorea/openstack-java-sdk
# | xz > openstack-java-sdk-3.0.0-git${git_hash}.tar.xz
Source0: %{name}-%{version}.tar.gz
+Patch0: 0001-resteasy-add-support-for-resteasy-3.patch
+
BuildArch: noarch
BuildRequires: java-devel >= 1:1.7.0
@@ -19,6 +21,8 @@ BuildRequires: jpackage-utils >= 0:1.7.3
BuildRequires: maven-local
BuildRequires: resteasy
BuildRequires: jboss-annotations-1.1-api
+BuildRequires: maven-gpg-plugin
+BuildRequires: jakarta-commons-httpclient
%description
@@ -133,6 +137,7 @@ This package contains the %{summary}.
%prep
%setup -q -n %{name}-%{version}
+%patch0 -p1
%mvn_package ":{openstack-java-sdk,openstack-client-connectors}" __noinstall
@@ -187,6 +192,9 @@ This package contains the %{summary}.
%changelog
+* Thu Aug 29 2013 Federico Simoncelli <fsimonce at redhat.com> - 3.0.0-2
+- resteasy: add support for resteasy 3
+
* Wed Aug 28 2013 Federico Simoncelli <fsimonce at redhat.com> - 3.0.0-1
- update to openstack-java-sdk-3.0.0
More information about the scm-commits
mailing list