You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2018/10/06 05:57:38 UTC
[cxf] branch master updated: Fix some eclipse warnings
This is an automated email from the ASF dual-hosted git repository.
dkulp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 2777f8a Fix some eclipse warnings
2777f8a is described below
commit 2777f8a403e2834bef8f92c07baf6e04caf7cb91
Author: Daniel Kulp <dk...@apache.org>
AuthorDate: Fri Oct 5 16:09:15 2018 -0400
Fix some eclipse warnings
---
.../cxf/jaxrs/impl/ConfigurationImplTest.java | 76 ++++++++++++----------
.../microprofile/rest/client/AsyncMethodTest.java | 4 --
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 09938810..dcdc9c5 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -223,24 +223,28 @@ public class ConfigurationImplTest extends Assert {
@Test
public void testServerFilterContractsOnClientIsRejected() {
- Configurable<Client> configurable = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT);
- Configuration config = configurable.getConfiguration();
- configurable.register(TestFilter.class);
- Map<Class<?>, Integer> contracts = config.getContracts(TestFilter.class);
- assertTrue(contracts.containsKey(ClientRequestFilter.class));
- assertTrue(contracts.containsKey(ClientResponseFilter.class));
- assertFalse(contracts.containsKey(ContainerRequestFilter.class));
- assertFalse(contracts.containsKey(ContainerResponseFilter.class));
+ try (ConfigurableImpl<Client> configurable
+ = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT)) {
+ Configuration config = configurable.getConfiguration();
+ configurable.register(TestFilter.class);
+ Map<Class<?>, Integer> contracts = config.getContracts(TestFilter.class);
+ assertTrue(contracts.containsKey(ClientRequestFilter.class));
+ assertTrue(contracts.containsKey(ClientResponseFilter.class));
+ assertFalse(contracts.containsKey(ContainerRequestFilter.class));
+ assertFalse(contracts.containsKey(ContainerResponseFilter.class));
+ }
}
@Test
public void testClientFilterWithNestedInterfacesIsAccepted() {
- Configurable<Client> configurable = new ConfigurableImpl<>(createClientProxy(), RuntimeType.CLIENT);
- Configuration config = configurable.getConfiguration();
- configurable.register(NestedInterfaceTestFilter.class);
- Map<Class<?>, Integer> contracts = config.getContracts(NestedInterfaceTestFilter.class);
- assertTrue(contracts.containsKey(ClientRequestFilter.class));
- assertTrue(contracts.containsKey(ClientResponseFilter.class));
+ try (ConfigurableImpl<Client> configurable
+ = new ConfigurableImpl<>(createClientProxy(), RuntimeType.CLIENT)) {
+ Configuration config = configurable.getConfiguration();
+ configurable.register(NestedInterfaceTestFilter.class);
+ Map<Class<?>, Integer> contracts = config.getContracts(NestedInterfaceTestFilter.class);
+ assertTrue(contracts.containsKey(ClientRequestFilter.class));
+ assertTrue(contracts.containsKey(ClientResponseFilter.class));
+ }
}
@Test
@@ -334,16 +338,18 @@ public class ConfigurationImplTest extends Assert {
TestHandler handler = new TestHandler();
LogUtils.getL7dLogger(ConfigurableImpl.class).addHandler(handler);
- Configurable<Client> configurable = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT);
- Configuration config = configurable.getConfiguration();
-
- configurable.register(ClientFilterConstrainedToServer.class);
-
- assertEquals(0, config.getInstances().size());
-
- for (String message : handler.messages) {
- if (message.startsWith("WARN") && message.contains("cannot be registered in ")) {
- return; // success
+ try (ConfigurableImpl<Client> configurable
+ = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT)) {
+ Configuration config = configurable.getConfiguration();
+
+ configurable.register(ClientFilterConstrainedToServer.class);
+
+ assertEquals(0, config.getInstances().size());
+
+ for (String message : handler.messages) {
+ if (message.startsWith("WARN") && message.contains("cannot be registered in ")) {
+ return; // success
+ }
}
}
fail("did not log expected message");
@@ -355,16 +361,18 @@ public class ConfigurationImplTest extends Assert {
TestHandler handler = new TestHandler();
LogUtils.getL7dLogger(ConfigurableImpl.class).addHandler(handler);
- Configurable<Client> configurable = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT);
- Configuration config = configurable.getConfiguration();
-
- configurable.register(ContainerResponseFilterImpl.class);
-
- assertEquals(0, config.getInstances().size());
-
- for (String message : handler.messages) {
- if (message.startsWith("WARN") && message.contains("Null, empty or invalid contracts specified")) {
- return; // success
+ try (ConfigurableImpl<Client> configurable
+ = new ConfigurableImpl<Client>(createClientProxy(), RuntimeType.CLIENT)) {
+ Configuration config = configurable.getConfiguration();
+
+ configurable.register(ContainerResponseFilterImpl.class);
+
+ assertEquals(0, config.getInstances().size());
+
+ for (String message : handler.messages) {
+ if (message.startsWith("WARN") && message.contains("Null, empty or invalid contracts specified")) {
+ return; // success
+ }
}
}
fail("did not log expected message");
diff --git a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
index 19efc46..0773555 100644
--- a/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
+++ b/systests/microprofile/client/async/src/test/java/org/apache/cxf/systest/microprofile/rest/client/AsyncMethodTest.java
@@ -146,8 +146,4 @@ public class AsyncMethodTest extends Assert {
return URI.create("http://localhost:" + wireMockRule.port() + "/echo");
}
- private void fail(Response r, String failureMessage) {
- System.out.println(r.getStatus());
- fail(failureMessage);
- }
}