Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 11B80200CD3 for ; Fri, 28 Jul 2017 18:15:40 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 37C831613A1; Fri, 28 Jul 2017 16:15:39 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8123416D023 for ; Fri, 28 Jul 2017 18:15:38 +0200 (CEST) Received: (qmail 86464 invoked by uid 500); 28 Jul 2017 16:15:22 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 86370 invoked by uid 99); 28 Jul 2017 16:15:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Jul 2017 16:15:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9FC64F321C; Fri, 28 Jul 2017 16:15:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dkulp@apache.org To: commits@cxf.apache.org Date: Fri, 28 Jul 2017 16:15:16 -0000 Message-Id: <6b11f5f2bb22498ab7f49be2b3ddc456@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [3/6] cxf git commit: Fix a bunch of eclipse warnings archived-at: Fri, 28 Jul 2017 16:15:40 -0000 Fix a bunch of eclipse warnings Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55c2f0e9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55c2f0e9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55c2f0e9 Branch: refs/heads/3.1.x-fixes Commit: 55c2f0e9f1c53501ab7078c2d0b9adaa3d67f1ab Parents: f7df387 Author: Daniel Kulp Authored: Wed Jul 26 13:45:49 2017 -0400 Committer: Daniel Kulp Committed: Fri Jul 28 12:13:21 2017 -0400 ---------------------------------------------------------------------- .../cxf/jaxrs/impl/AsyncResponseImpl.java | 3 +- .../jaxrs/interceptor/JAXRSOutInterceptor.java | 3 +- .../apache/cxf/jaxrs/impl/ResponseImplTest.java | 43 ++++++++++---------- 3 files changed, 26 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java index f1606c9..f4395d8 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/AsyncResponseImpl.java @@ -269,7 +269,8 @@ public class AsyncResponseImpl implements AsyncResponse, ContinuationCallback { return false; } } - + + @SuppressWarnings("resource") // Response that is built here shouldn't be closed here public Object getResponseObject() { Object obj = cont.getObject(); if (!(obj instanceof Response) && !(obj instanceof Throwable)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java index 9ee4c7d..7adbdbb 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java @@ -87,7 +87,8 @@ public class JAXRSOutInterceptor extends AbstractOutDatabindingInterceptor { } - + + @SuppressWarnings("resource") // Response shouldn't be closed here private void processResponse(ServerProviderFactory providerFactory, Message message) { if (isResponseAlreadyHandled(message)) { http://git-wip-us.apache.org/repos/asf/cxf/blob/55c2f0e9/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java index 72d90d5..915a3b6 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ResponseImplTest.java @@ -65,6 +65,7 @@ import org.junit.Assert; import org.junit.Test; +@SuppressWarnings("resource") // Responses built in this test don't need to be closed public class ResponseImplTest extends Assert { @Test @@ -391,27 +392,27 @@ public class ResponseImplTest extends Assert { @Test public void testGetLinksNoRel() { - ResponseImpl ri = new ResponseImpl(200); - MetadataMap meta = new MetadataMap(); - ri.addMetadata(meta); - - Set links = ri.getLinks(); - assertTrue(links.isEmpty()); - - meta.add(HttpHeaders.LINK, ""); - meta.add(HttpHeaders.LINK, ""); - - assertFalse(ri.hasLink("next")); - Link next = ri.getLink("next"); - assertNull(next); - assertFalse(ri.hasLink("prev")); - Link prev = ri.getLink("prev"); - assertNull(prev); - - links = ri.getLinks(); - assertTrue(links.contains(Link.fromUri("http://next").build())); - assertTrue(links.contains(Link.fromUri("http://prev").build())); - + try (ResponseImpl ri = new ResponseImpl(200)) { + MetadataMap meta = new MetadataMap(); + ri.addMetadata(meta); + + Set links = ri.getLinks(); + assertTrue(links.isEmpty()); + + meta.add(HttpHeaders.LINK, ""); + meta.add(HttpHeaders.LINK, ""); + + assertFalse(ri.hasLink("next")); + Link next = ri.getLink("next"); + assertNull(next); + assertFalse(ri.hasLink("prev")); + Link prev = ri.getLink("prev"); + assertNull(prev); + + links = ri.getLinks(); + assertTrue(links.contains(Link.fromUri("http://next").build())); + assertTrue(links.contains(Link.fromUri("http://prev").build())); + } } public static class StringBean {