You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/11/18 07:02:16 UTC
[camel] 02/02: fixed some code-style issues.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 016b158a63f42ac6767a8a59b3433be11c8b5741
Author: Bruno Meseguer <br...@gmail.com>
AuthorDate: Fri Nov 17 16:06:26 2017 +0000
fixed some code-style issues.
---
.../example/artemis/amqp/ArtemisAmqpTest.java | 17 +++++------
.../artemis/amqp/EmbeddedBrokerSupport.java | 10 +++----
.../src/test/resources/broker.xml | 33 +++++++++++-----------
3 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/ArtemisAmqpTest.java b/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/ArtemisAmqpTest.java
index cb9bfc1..c604bef 100644
--- a/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/ArtemisAmqpTest.java
+++ b/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/ArtemisAmqpTest.java
@@ -24,32 +24,29 @@ import org.junit.BeforeClass;
import org.junit.Test;
public class ArtemisAmqpTest extends CamelBlueprintTestSupport {
-
+
@Override
- protected String getBlueprintDescriptor()
- {
- return "/OSGI-INF/blueprint/camel-context.xml,"+
+ protected String getBlueprintDescriptor() {
+ return "/OSGI-INF/blueprint/camel-context.xml,"
//We add the embedded Artemis Broker
- "/OSGI-INF/blueprint/embedded-broker.xml";
+ + "/OSGI-INF/blueprint/embedded-broker.xml";
}
@Override
- protected String useOverridePropertiesWithConfigAdmin(Dictionary props)
- {
+ protected String useOverridePropertiesWithConfigAdmin(Dictionary props) {
//obtain an available port
int port = AvailablePortFinder.getNextAvailable();
//override the netty port to use
- props.put("netty.port", ""+port);
+ props.put("netty.port", "" + port);
//return the PID of the config-admin we are using in the blueprint xml file
return "my-placeholders";
}
@Test
- public void testEmbeddedBroker() throws Exception
- {
+ public void testEmbeddedBroker() throws Exception {
//trigger
String response = template.requestBody("netty4-http:localhost:{{netty.port}}/message", null, String.class);
diff --git a/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/EmbeddedBrokerSupport.java b/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/EmbeddedBrokerSupport.java
index 1a491fa..052615c 100644
--- a/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/EmbeddedBrokerSupport.java
+++ b/examples/camel-example-artemis-amqp-blueprint/src/test/java/org/apache/camel/example/artemis/amqp/EmbeddedBrokerSupport.java
@@ -26,10 +26,9 @@ import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager
// Blueprint does not support Bean inheritance (necessary for Artemis EmbeddedJMS)
// We need therefore a 'support' class
//#################################################
-public class EmbeddedBrokerSupport extends EmbeddedJMS
-{
- public EmbeddedBrokerSupport(ActiveMQJAASSecurityManager securityManager) throws Exception
- {
+public class EmbeddedBrokerSupport extends EmbeddedJMS {
+
+ public EmbeddedBrokerSupport(ActiveMQJAASSecurityManager securityManager) throws Exception {
super();
this.setSecurityManager(securityManager);
this.start();
@@ -43,8 +42,7 @@ public class EmbeddedBrokerSupport extends EmbeddedJMS
// this.setSecurityManager(securityManager);
}
- public void close() throws Exception
- {
+ public void close() throws Exception {
this.stop();
}
}
diff --git a/examples/camel-example-artemis-amqp-blueprint/src/test/resources/broker.xml b/examples/camel-example-artemis-amqp-blueprint/src/test/resources/broker.xml
index 4bacf5f..746eaf3 100644
--- a/examples/camel-example-artemis-amqp-blueprint/src/test/resources/broker.xml
+++ b/examples/camel-example-artemis-amqp-blueprint/src/test/resources/broker.xml
@@ -1,23 +1,22 @@
<?xml version='1.0'?>
<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
<configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="urn:activemq"
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.