You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2016/05/09 18:52:22 UTC
camel git commit: Better bypass calling System#getProperties
Repository: camel
Updated Branches:
refs/heads/master 1b838547b -> 35be1b70e
Better bypass calling System#getProperties
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35be1b70
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35be1b70
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35be1b70
Branch: refs/heads/master
Commit: 35be1b70e5f88a3a38e16f80cb56a222365a897f
Parents: 1b83854
Author: Babak Vahdat <bv...@apache.org>
Authored: Mon May 9 20:51:56 2016 +0200
Committer: Babak Vahdat <bv...@apache.org>
Committed: Mon May 9 20:51:56 2016 +0200
----------------------------------------------------------------------
.../properties/PropertiesComponentDefaultFunctionsTest.java | 4 ++--
.../component/http4/HttpProducerWithSystemPropertiesTest.java | 6 +++---
.../apache/camel/component/http4/HttpsServerTestSupport.java | 4 ++--
.../java/org/apache/camel/component/javaspace/Utility.java | 2 +-
.../component/jetty/HttpClientRouteEnableChunkedTest.java | 4 ++--
.../org/apache/camel/component/jetty/HttpClientRouteTest.java | 2 +-
.../org/apache/camel/component/jetty/HttpsAsyncRouteTest.java | 2 +-
.../java/org/apache/camel/component/jetty/HttpsRouteTest.java | 2 +-
.../org/apache/camel/component/jetty/SpringHttpsRouteTest.java | 2 +-
.../apache/camel/component/netty/http/NettyHttpSSLTest.java | 2 +-
.../apache/camel/component/netty4/http/NettyHttpSSLTest.java | 2 +-
.../component/restlet/SpringRestRestletPojoInOutTest.java | 2 +-
12 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
index 6328c0e..bf8f112 100644
--- a/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/properties/PropertiesComponentDefaultFunctionsTest.java
@@ -49,7 +49,7 @@ public class PropertiesComponentDefaultFunctionsTest extends ContextTestSupport
assertMockEndpointsSatisfied();
- System.getProperties().remove("FOO");
+ System.clearProperty("FOO");
}
public void testFunctionGetOrElse() throws Exception {
@@ -72,7 +72,7 @@ public class PropertiesComponentDefaultFunctionsTest extends ContextTestSupport
assertMockEndpointsSatisfied();
- System.getProperties().remove("FOO2");
+ System.clearProperty("FOO2");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
index 4433000..dee2b32 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProducerWithSystemPropertiesTest.java
@@ -42,15 +42,15 @@ public class HttpProducerWithSystemPropertiesTest extends BaseHttpTest {
@BeforeClass
public static void setUpHttpAgentSystemProperty() throws Exception {
// the 'http.agent' java system-property corresponds to the http 'User-Agent' header
- defaultSystemHttpAgent = System.getProperties().setProperty("http.agent", "myCoolCamelCaseAgent");
+ defaultSystemHttpAgent = System.setProperty("http.agent", "myCoolCamelCaseAgent");
}
@AfterClass
public static void resetHttpAgentSystemProperty() throws Exception {
if (defaultSystemHttpAgent != null) {
- System.getProperties().setProperty("http.agent", String.valueOf(defaultSystemHttpAgent));
+ System.setProperty("http.agent", String.valueOf(defaultSystemHttpAgent));
} else {
- System.getProperties().remove("http.agent");
+ System.clearProperty("http.agent");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
index 729a71b..872ed4e 100644
--- a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
+++ b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpsServerTestSupport.java
@@ -51,8 +51,8 @@ public abstract class HttpsServerTestSupport extends HttpServerTestSupport {
public void tearDown() throws Exception {
super.tearDown();
- System.getProperties().remove("javax.net.ssl.trustStorePassword");
- System.getProperties().remove("javax.net.ssl.trustStore");
+ System.clearProperty("javax.net.ssl.trustStorePassword");
+ System.clearProperty("javax.net.ssl.trustStore");
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/Utility.java
----------------------------------------------------------------------
diff --git a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/Utility.java b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/Utility.java
index c90a05e..55b6ad8 100644
--- a/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/Utility.java
+++ b/components/camel-javaspace/src/main/java/org/apache/camel/component/javaspace/Utility.java
@@ -49,7 +49,7 @@ public final class Utility {
}
out.close();
in.close();
- System.getProperties().put("java.security.policy", outfile.getAbsolutePath());
+ System.setProperty("java.security.policy", outfile.getAbsolutePath());
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteEnableChunkedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteEnableChunkedTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteEnableChunkedTest.java
index 7d8ba72..80a409f 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteEnableChunkedTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteEnableChunkedTest.java
@@ -35,7 +35,7 @@ public class HttpClientRouteEnableChunkedTest extends BaseJettyTest {
}
private void testHttpClient(String uri) throws Exception {
- System.getProperties().put("HTTPClient.dontChunkRequests", "yes");
+ System.setProperty("HTTPClient.dontChunkRequests", "yes");
MockEndpoint mockEndpoint = getMockEndpoint("mock:a");
mockEndpoint.expectedBodiesReceived("<b>Hello World</b>");
@@ -59,7 +59,7 @@ public class HttpClientRouteEnableChunkedTest extends BaseJettyTest {
// should get the Content-Length
assertEquals("Should get the transfer-encoding as chunked", "chunked", headers.get("Transfer-Encoding"));
// remove the system property
- System.getProperties().remove("HTTPClient.dontChunkRequests");
+ System.clearProperty("HTTPClient.dontChunkRequests");
}
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
index 848cc70..5f6cdfb 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpClientRouteTest.java
@@ -44,7 +44,7 @@ public class HttpClientRouteTest extends BaseJettyTest {
}
private void testHttpClient(String uri) throws Exception {
- System.getProperties().put("HTTPClient.dontChunkRequests", "yes");
+ System.setProperty("HTTPClient.dontChunkRequests", "yes");
MockEndpoint mockEndpoint = getMockEndpoint("mock:a");
mockEndpoint.expectedBodiesReceived("<b>Hello World</b>");
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
index a9e986e..e66a211 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsAsyncRouteTest.java
@@ -67,7 +67,7 @@ public class HttpsAsyncRouteTest extends HttpsRouteTest {
for (Object key : originalValues.keySet()) {
Object value = originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
+ System.clearProperty((String) key);
} else {
System.setProperty((String)key, (String)value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
index 3403897..57974db 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/HttpsRouteTest.java
@@ -81,7 +81,7 @@ public class HttpsRouteTest extends BaseJettyTest {
for (Object key : originalValues.keySet()) {
Object value = originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
+ System.clearProperty((String) key);
} else {
System.setProperty((String)key, (String)value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
index fe4154f..1e14395 100644
--- a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
+++ b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/SpringHttpsRouteTest.java
@@ -84,7 +84,7 @@ public class SpringHttpsRouteTest {
for (Object key : originalValues.keySet()) {
Object value = originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
+ System.clearProperty((String) key);
} else {
System.setProperty((String) key, (String) value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
index ad40418..147f107 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyHttpSSLTest.java
@@ -60,7 +60,7 @@ public class NettyHttpSSLTest extends BaseNettyTest {
for (Object key : originalValues.keySet()) {
Object value = originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
+ System.clearProperty((String) key);
} else {
System.setProperty((String) key, (String) value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
----------------------------------------------------------------------
diff --git a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
index 9218468..b41707f 100644
--- a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
+++ b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyHttpSSLTest.java
@@ -60,7 +60,7 @@ public class NettyHttpSSLTest extends BaseNettyTest {
for (Object key : originalValues.keySet()) {
Object value = originalValues.get(key);
if (NULL_VALUE_MARKER.equals(value)) {
- System.getProperties().remove(key);
+ System.clearProperty((String) key);
} else {
System.setProperty((String) key, (String) value);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/35be1b70/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.java
----------------------------------------------------------------------
diff --git a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.java b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.java
index d52099b..73e1cf1 100644
--- a/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.java
+++ b/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/SpringRestRestletPojoInOutTest.java
@@ -33,7 +33,7 @@ public class SpringRestRestletPojoInOutTest extends CamelSpringTestSupport {
@BeforeClass
public static void initializePortNum() {
portNum = AvailablePortFinder.getNextAvailable();
- System.getProperties().setProperty("test.port", "" + portNum);
+ System.setProperty("test.port", "" + portNum);
}
@Override