You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gz...@apache.org on 2015/11/08 11:11:37 UTC
[3/3] camel git commit: fix up camel-core checkstyle
fix up camel-core checkstyle
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5097fc0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5097fc0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5097fc0
Branch: refs/heads/camel-2.16.x
Commit: c5097fc092ae4f061b31aa4f66657df563fbc5e4
Parents: 4715847
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Sat Oct 10 18:24:46 2015 -0230
Committer: Gregor Zurowski <gr...@zurowski.org>
Committed: Sun Nov 8 11:11:24 2015 +0100
----------------------------------------------------------------------
buildingtools/src/main/resources/camel-checkstyle.xml | 2 +-
.../apache/camel/api/management/mbean/CamelOpenMBeanTypes.java | 2 +-
.../src/main/java/org/apache/camel/impl/DefaultRestRegistry.java | 3 ++-
.../src/main/java/org/apache/camel/impl/GzipDataFormat.java | 1 -
.../java/org/apache/camel/impl/DataFormatContextAwareTest.java | 1 -
5 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/buildingtools/src/main/resources/camel-checkstyle.xml
----------------------------------------------------------------------
diff --git a/buildingtools/src/main/resources/camel-checkstyle.xml b/buildingtools/src/main/resources/camel-checkstyle.xml
index 4c60fc6..02fd21c 100644
--- a/buildingtools/src/main/resources/camel-checkstyle.xml
+++ b/buildingtools/src/main/resources/camel-checkstyle.xml
@@ -53,7 +53,7 @@ lengths, if/try depths, etc...
</module>
<module name="FileLength">
- <property name="max" value="4000"/>
+ <property name="max" value="4500"/>
</module>
<module name="FileTabCharacter">
http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
index 549a2f6..fc00071 100644
--- a/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
+++ b/camel-core/src/main/java/org/apache/camel/api/management/mbean/CamelOpenMBeanTypes.java
@@ -98,7 +98,7 @@ public final class CamelOpenMBeanTypes {
return new CompositeType("dataformats", "DataFormats", new String[]{"option", "kind", "label", "type", "java type", "deprecated", "value", "default value", "description"},
new String[]{"Option", "Kind", "Label", "Type", "Java Type", "Deprecated", "Value", "Default Value", "Description"},
new OpenType[]{SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING,
- SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
+ SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.STRING});
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
index 250566d..04a827d 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultRestRegistry.java
@@ -91,7 +91,8 @@ public class DefaultRestRegistry extends ServiceSupport implements StaticService
RestConfiguration config = camelContext.getRestConfiguration(componentName, true);
String apiComponent = config.getApiComponent() != null ? config.getApiComponent() : RestApiEndpoint.DEFAULT_API_COMPONENT_NAME;
String path = config.getApiContextPath() != null ? config.getApiContextPath() : "api-doc";
- restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#", path, camelContext.getName(), componentName, apiComponent));
+ restApiEndpoint = camelContext.getEndpoint(String.format("rest-api:%s/%s?componentName=%s&apiComponentName=%s&contextIdPattern=#name#",
+ path, camelContext.getName(), componentName, apiComponent));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java b/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
index 7770687..66f7a7f 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
@@ -25,7 +25,6 @@ import java.util.zip.GZIPOutputStream;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
-import org.apache.camel.support.*;
import org.apache.camel.util.IOHelper;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/c5097fc0/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java b/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
index db451b3..1f61954 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DataFormatContextAwareTest.java
@@ -24,7 +24,6 @@ import org.apache.camel.CamelContextAware;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
-import org.apache.camel.support.*;
/**
*