From a54e56ff9fdfb130d245d3b708d808ef5f5fdccc Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:07:59 +0200 Subject: [PATCH 01/18] junit updated to 4.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 168c11e..1d796b0 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ junit junit - 4.8.2 + 4.10 test From 79e9c051dc7d6f23c85d3be3889a5bc05c4e2f06 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:09:15 +0200 Subject: [PATCH 02/18] AHC upgraded to 1.7.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d796b0..f8dbba3 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ com.ning async-http-client - 1.6.4 + 1.7.6 com.sun.xml.bind From c40e83e15d2aaa1f573c0de1199fe2423b54f885 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:16:45 +0200 Subject: [PATCH 03/18] jersey version defined in a property (simplify the updates) --- pom.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f8dbba3..e653922 100644 --- a/pom.xml +++ b/pom.xml @@ -55,16 +55,19 @@ repo + + 1.5 + com.sun.jersey jersey-client - 1.5 + ${jersey.version} com.sun.jersey jersey-json - 1.5 + ${jersey.version} javax.ws.rs @@ -104,7 +107,7 @@ com.sun.jersey jersey-server - 1.5 + ${jersey.version} test From 352ef0cf358d7a168f486d2a700d6f8d52c496c5 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:21:16 +0200 Subject: [PATCH 04/18] sources are targeted JDK1.5, no @Override on interfaces methods --- .../org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java | 1 - .../org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java index a023ae4..b09babe 100644 --- a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java +++ b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcClientHandler.java @@ -105,7 +105,6 @@ public AsyncHttpClient getHttpClient() { * @return the {@link ClientResponse} * @throws ClientHandlerException */ - @Override public ClientResponse handle(final ClientRequest cr) throws ClientHandlerException { diff --git a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java index 9684d54..df82aec 100644 --- a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java +++ b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java @@ -61,13 +61,12 @@ protected void commit() throws IOException { final byte[] content = baos.toByteArray(); requestBuilder.setBody(new Request.EntityWriter() { - @Override public void writeEntity(OutputStream out) throws IOException { out.write(content); } }); } else { - configureHeaders(cr.getMetadata(), requestBuilder); + configureHeaders(cr.getMetadata(), requestBuilder); } } From 7311ee7cebbe2af4db2cd897b3b5041481982fce Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:31:13 +0200 Subject: [PATCH 05/18] forge-parent updated to v12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e653922..96245a7 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.sonatype.forge forge-parent - 6 + 12 4.0.0 org.sonatype.spice From ea5f0d73acb8e98311fbb4785cf50d83a313385a Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:32:58 +0200 Subject: [PATCH 06/18] compiler-plugin managed by the forge-parent --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 96245a7..d9e9663 100644 --- a/pom.xml +++ b/pom.xml @@ -189,10 +189,7 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 - 1.5 - 1.5 UTF-8 1024m From a9011a3f2b7c10b9a3b140e510ac201f6123ca76 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:35:56 +0200 Subject: [PATCH 07/18] source encoding defined in the forge-parent via properties --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9e9663..2f6160d 100644 --- a/pom.xml +++ b/pom.xml @@ -190,7 +190,6 @@ org.apache.maven.plugins maven-compiler-plugin - UTF-8 1024m From 39c5c7bb56e4c77fd0db242038285a984c495764 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:36:43 +0200 Subject: [PATCH 08/18] animal-sniffer-maven-plugin managed by forge-parent --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2f6160d..355f807 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,6 @@ org.codehaus.mojo animal-sniffer-maven-plugin - 1.6 org.codehaus.mojo.signature From ffe29e9922812d48688d4e607248c5ca0bec6aed Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:37:13 +0200 Subject: [PATCH 09/18] maven-bundle-plugin managed by forge-parent --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 355f807..9290488 100644 --- a/pom.xml +++ b/pom.xml @@ -137,7 +137,6 @@ org.apache.felix maven-bundle-plugin - 2.0.1 true META-INF From 77a7c1edb1705509cae96a53dd8f5ce88f59bc0d Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:37:41 +0200 Subject: [PATCH 10/18] maven-enforcer-plugin managed by forge-parent --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9290488..17ec79e 100644 --- a/pom.xml +++ b/pom.xml @@ -164,7 +164,6 @@ org.apache.maven.plugins maven-enforcer-plugin - 1.0-beta-1 enforce-versions From b2ff7be29a63d52c1a5cee7627b40213154c0a3f Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:38:37 +0200 Subject: [PATCH 11/18] maven-resources-plugin managed by forge-parent --- pom.xml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pom.xml b/pom.xml index 17ec79e..15345d5 100644 --- a/pom.xml +++ b/pom.xml @@ -190,14 +190,6 @@ 1024m - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - UTF-8 - - org.apache.maven.plugins maven-release-plugin From 2f9482c7378a994bbb03be7a8adbf0690d600228 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:40:15 +0200 Subject: [PATCH 12/18] maven-release-plugin managed by forge-parent --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index 15345d5..56db0bd 100644 --- a/pom.xml +++ b/pom.xml @@ -190,11 +190,6 @@ 1024m - - org.apache.maven.plugins - maven-release-plugin - 2.1 - org.apache.maven.plugins maven-jar-plugin From 55cd32c2b8818e7301dcf239c24fb345f290d4ef Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:40:50 +0200 Subject: [PATCH 13/18] maven-jar-plugin managed by forge-parent --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 56db0bd..4e18014 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,6 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.1 From 11b9a5531fbb8d4ac0cc347d7c1239a781d62f68 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:42:02 +0200 Subject: [PATCH 14/18] maven-source-plugin managed by forge-parent --- pom.xml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pom.xml b/pom.xml index 4e18014..003f924 100644 --- a/pom.xml +++ b/pom.xml @@ -201,20 +201,6 @@ - - org.apache.maven.plugins - maven-source-plugin - 2.1.2 - - - attach-sources - verify - - jar-no-fork - - - - From 237f6928a4f574ff41a9b26a985a2b6b53321854 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 10:47:07 +0200 Subject: [PATCH 15/18] added myself in the developers list --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 003f924..17ad31c 100644 --- a/pom.xml +++ b/pom.xml @@ -42,6 +42,11 @@ Jeanfrancois Arcand jfarcand@apache.org + + simonetripodi + Simone Tripodi + simonetripodi@apache.org + From c08b6052734fb5f360cba4af89292481c3992dda Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 11:32:28 +0200 Subject: [PATCH 16/18] jersey client updated to version 1.14 --- pom.xml | 8 +++++++- .../sonatype/spice/jersey/client/ahc/AhcHttpClient.java | 6 +++++- .../spice/jersey/client/ahc/AhcRequestWriter.java | 4 +++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 17ad31c..3563c19 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ - 1.5 + 1.14 @@ -115,6 +115,12 @@ ${jersey.version} test + + com.sun.jersey + jersey-bundle + ${jersey.version} + test + install diff --git a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcHttpClient.java b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcHttpClient.java index 48d6a8d..88779b5 100644 --- a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcHttpClient.java +++ b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcHttpClient.java @@ -149,7 +149,11 @@ protected void finalize(){ // Do not close the AHCClient. super.destroy(); } finally { - super.finalize(); + try { + super.finalize(); + } catch (Throwable e) { + // TODO swallow? + } } } diff --git a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java index df82aec..35dcf4b 100644 --- a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java +++ b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java @@ -11,6 +11,8 @@ *******************************************************************************/ package org.sonatype.spice.jersey.client.ahc; +import static com.sun.jersey.api.client.ClientRequest.getHeaderValue; + import com.ning.http.client.PerRequestConfig; import com.ning.http.client.Request; import com.ning.http.client.RequestBuilder; @@ -77,7 +79,7 @@ private void configureHeaders(MultivaluedMap metadata, RequestBu if (String.class.isAssignableFrom( o.getClass() )) { requestBuilder.addHeader(e.getKey(), o.toString()); } else { - requestBuilder.addHeader(e.getKey(), headerValueToString(o)); + requestBuilder.addHeader(e.getKey(), getHeaderValue(o)); } } } From 5249206af83c2a701291dba30982c79268aed816 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 11:33:05 +0200 Subject: [PATCH 17/18] raw types, trailing spaces --- .../tests/AbstractGrizzlyServerTester.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/sonatype/spice/jersey/client/ahc/tests/tests/AbstractGrizzlyServerTester.java b/src/test/java/org/sonatype/spice/jersey/client/ahc/tests/tests/AbstractGrizzlyServerTester.java index 4313b71..d781abb 100644 --- a/src/test/java/org/sonatype/spice/jersey/client/ahc/tests/tests/AbstractGrizzlyServerTester.java +++ b/src/test/java/org/sonatype/spice/jersey/client/ahc/tests/tests/AbstractGrizzlyServerTester.java @@ -33,7 +33,7 @@ public abstract class AbstractGrizzlyServerTester extends TestCase { private SelectorThread selectorThread; private int port = getEnvVariable("JERSEY_HTTP_PORT", 9997); - + private static int getEnvVariable(final String varName, int defaultValue) { if (null == varName) { return defaultValue; @@ -52,26 +52,26 @@ private static int getEnvVariable(final String varName, int defaultValue) { public AbstractGrizzlyServerTester(String name) { super(name); } - + public UriBuilder getUri() { return UriBuilder.fromUri("http://localhost").port(port).path(CONTEXT); } - - public void startServer(Class... resources) { + + public void startServer(Class... resources) { start(ContainerFactory.createContainer(Adapter.class, resources)); } - + public void startServer(ResourceConfig config) { start(ContainerFactory.createContainer(Adapter.class, config)); } - + private void start(Adapter adapter) { if (selectorThread != null && selectorThread.isRunning()){ stopServer(); } System.out.println("Starting GrizzlyServer port number = " + port); - + URI u = UriBuilder.fromUri("http://localhost").port(port).build(); try { selectorThread = GrizzlyServerFactory.create(u, adapter); @@ -91,13 +91,13 @@ private void start(Adapter adapter) { } } } - + public void stopServer() { if (selectorThread.isRunning()) { selectorThread.stopEndpoint(); } } - + @Override public void tearDown() { stopServer(); From d966eacc13d504b632914e7f08f2b0a07894b418 Mon Sep 17 00:00:00 2001 From: simonetripodi Date: Wed, 19 Sep 2012 11:44:54 +0200 Subject: [PATCH 18/18] ClientRequest#getMetadata() is deprecated, replaced with ClientRequest#getHeaders() --- .../sonatype/spice/jersey/client/ahc/AhcRequestWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java index 35dcf4b..4143cd1 100644 --- a/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java +++ b/src/main/java/org/sonatype/spice/jersey/client/ahc/AhcRequestWriter.java @@ -54,7 +54,7 @@ public void configureRequest(final RequestBuilder requestBuilder, final ClientRe re.writeRequestEntity(new CommittingOutputStream(baos) { @Override protected void commit() throws IOException { - configureHeaders(cr.getMetadata(), requestBuilder); + configureHeaders(cr.getHeaders(), requestBuilder); } }); } catch (IOException ex) { @@ -68,7 +68,7 @@ public void writeEntity(OutputStream out) throws IOException { } }); } else { - configureHeaders(cr.getMetadata(), requestBuilder); + configureHeaders(cr.getHeaders(), requestBuilder); } }