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 2018/04/18 21:25:17 UTC
[camel] branch master updated: fix the ci-server build warnings
This is an automated email from the ASF dual-hosted git repository.
bvahdat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new f3d097b fix the ci-server build warnings
f3d097b is described below
commit f3d097b6f756e27b0163b328a6dc061ee9d929ba
Author: Babak Vahdat <bv...@apache.org>
AuthorDate: Wed Apr 18 23:25:06 2018 +0200
fix the ci-server build warnings
---
.../org/apache/camel/model/RouteGroupTest.java | 2 +-
.../org/apache/camel/model/XmlRouteGroupTest.java | 2 +-
.../org/apache/camel/model/routeGroup.xml | 32 ++++++++++++----------
.../apache/camel/component/aws/s3/S3Producer.java | 2 +-
.../apache/camel/component/box/BoxEndpoint.java | 1 -
.../box/BoxEventsManagerIntegrationTest.java | 3 +-
.../braintree/PlanGatewayIntegrationTest.java | 1 -
...ttlementBatchSummaryGatewayIntegrationTest.java | 2 --
8 files changed, 21 insertions(+), 24 deletions(-)
diff --git a/camel-core/src/test/java/org/apache/camel/model/RouteGroupTest.java b/camel-core/src/test/java/org/apache/camel/model/RouteGroupTest.java
index 67bbf2f..23aa369 100644
--- a/camel-core/src/test/java/org/apache/camel/model/RouteGroupTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/RouteGroupTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
diff --git a/camel-core/src/test/java/org/apache/camel/model/XmlRouteGroupTest.java b/camel-core/src/test/java/org/apache/camel/model/XmlRouteGroupTest.java
index 0393f80..af9dee8 100644
--- a/camel-core/src/test/java/org/apache/camel/model/XmlRouteGroupTest.java
+++ b/camel-core/src/test/java/org/apache/camel/model/XmlRouteGroupTest.java
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
diff --git a/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml b/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml
index e05e5fa..7548f8c 100644
--- a/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml
+++ b/camel-core/src/test/resources/org/apache/camel/model/routeGroup.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ 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.
+
+-->
<routes xmlns="http://camel.apache.org/schema/spring"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
diff --git a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
index fb21dd9..fc5c235 100644
--- a/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
+++ b/components/camel-aws/src/main/java/org/apache/camel/component/aws/s3/S3Producer.java
@@ -229,7 +229,7 @@ public class S3Producer extends DefaultProducer {
}
String bucketName = exchange.getIn().getHeader(S3Constants.BUCKET_NAME, String.class);
- if (bucketName == null){
+ if (bucketName == null) {
LOG.trace("Bucket name is not in header, using default one [{}]...", getConfiguration().getBucketName());
bucketName = getConfiguration().getBucketName();
}
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index c8eb1b6..e033839 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -26,7 +26,6 @@ import org.apache.camel.component.box.api.BoxCollaborationsManager;
import org.apache.camel.component.box.api.BoxCommentsManager;
import org.apache.camel.component.box.api.BoxEventLogsManager;
import org.apache.camel.component.box.api.BoxEventsManager;
-import org.apache.camel.component.box.internal.BoxApiName;
import org.apache.camel.component.box.api.BoxFilesManager;
import org.apache.camel.component.box.api.BoxFoldersManager;
import org.apache.camel.component.box.api.BoxGroupsManager;
diff --git a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
index 6ed2de4..5df2ff3 100644
--- a/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
+++ b/components/camel-box/camel-box-component/src/test/java/org/apache/camel/component/box/BoxEventsManagerIntegrationTest.java
@@ -28,9 +28,8 @@ import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.box.api.BoxEventsManager;
import org.apache.camel.component.box.internal.BoxApiCollection;
-import org.apache.camel.component.box.internal.BoxFilesManagerApiMethod;
-import org.apache.camel.component.box.internal.BoxApiCollection;
import org.apache.camel.component.box.internal.BoxEventsManagerApiMethod;
+import org.apache.camel.component.box.internal.BoxFilesManagerApiMethod;
import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
index de87f0b..0ec6ee8 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/PlanGatewayIntegrationTest.java
@@ -21,7 +21,6 @@ import java.util.List;
import com.braintreegateway.Plan;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.braintree.internal.PlanGatewayApiMethod;
-import org.apache.camel.component.braintree.internal.PlanGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
diff --git a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
index eace19e..6e159f8 100644
--- a/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
+++ b/components/camel-braintree/src/test/java/org/apache/camel/component/braintree/SettlementBatchSummaryGatewayIntegrationTest.java
@@ -22,8 +22,6 @@ import java.util.Map;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
import org.apache.camel.component.braintree.internal.SettlementBatchSummaryGatewayApiMethod;
-import org.apache.camel.component.braintree.internal.BraintreeApiCollection;
-import org.apache.camel.component.braintree.internal.SettlementBatchSummaryGatewayApiMethod;
import org.junit.Ignore;
import org.junit.Test;
import org.slf4j.Logger;
--
To stop receiving notification emails like this one, please contact
bvahdat@apache.org.