Repository: camel Updated Branches: refs/heads/master 344db6660 -> fdcf9182f
Update camel-core and apt to be "clean" in eclipse with the latest eclipse checkstyle plugins Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/17d39d90 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/17d39d90 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/17d39d90 Branch: refs/heads/master Commit: 17d39d907d9d07e4d17032fdb6b09c697d82fd18 Parents: 344db66 Author: Daniel Kulp <dk...@apache.org> Authored: Tue Jul 14 12:53:24 2015 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Tue Jul 14 14:01:54 2015 -0400 ---------------------------------------------------------------------- .gitignore | 5 +- .../org/apache/camel/impl/DefaultExchange.java | 2 +- .../event/ExchangeFailureHandledEvent.java | 4 +- .../mbean/ManagedPerformanceCounter.java | 4 +- .../camel/model/LoadBalanceDefinition.java | 2 +- .../apache/camel/model/MarshalDefinition.java | 70 ++++++++++---------- .../camel/model/ResequenceDefinition.java | 6 +- .../apache/camel/model/UnmarshalDefinition.java | 70 ++++++++++---------- .../apache/camel/model/rest/VerbDefinition.java | 2 +- .../processor/aggregate/AggregateProcessor.java | 32 ++++++--- .../aggregate/MemoryAggregationRepository.java | 8 ++- .../apache/camel/util/CamelContextStatDump.java | 2 +- .../apache/camel/util/CamelVersionHelper.java | 3 + .../java/org/apache/camel/util/MessageDump.java | 4 +- .../org/apache/camel/util/RouteStatDump.java | 2 +- .../camel/component/bean/CamelCustomer.java | 4 ++ .../util/component/ApiMethodHelperTest.java | 20 ++++-- .../camel/tools/apt/DocumentationHelper.java | 3 + 18 files changed, 145 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 43d4e81..956cf21 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,7 @@ test-salesforce-login.properties dependency-reduced-pom.xml id_file components/camel-solr/data -*.epoch \ No newline at end of file +*.epoch +.factorypath +.pmd + http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java index 9707d00..05ffd76 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultExchange.java @@ -80,7 +80,7 @@ public final class DefaultExchange implements Exchange { @Override public String toString() { - return String.format("Exchange[%s][%s]", exchangeId, (out == null ? in : out)); + return String.format("Exchange[%s][%s]", exchangeId, out == null ? in : out); } public Exchange copy() { http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java index 4aeae2c..862fb3a 100644 --- a/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java +++ b/camel-core/src/main/java/org/apache/camel/management/event/ExchangeFailureHandledEvent.java @@ -55,7 +55,9 @@ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent { return handled; } - public boolean isContinued() { return !handled; } + public boolean isContinued() { + return !handled; + } @Override public String toString() { http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java index fe1320c..f5124a8 100644 --- a/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java +++ b/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedPerformanceCounter.java @@ -109,7 +109,9 @@ public abstract class ManagedPerformanceCounter extends ManagedCounter implement return exchangesFailed.getValue(); } - public long getExchangesInflight() { return exchangesInflight.getValue(); } + public long getExchangesInflight() { + return exchangesInflight.getValue(); + } public long getFailuresHandled() throws Exception { return failuresHandled.getValue(); http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java index 97db364..e41e2c5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java @@ -57,7 +57,7 @@ public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefini @XmlElement(required = false, name = "topic", type = TopicLoadBalancerDefinition.class), @XmlElement(required = false, name = "weighted", type = WeightedLoadBalancerDefinition.class), @XmlElement(required = false, name = "circuitBreaker", type = CircuitBreakerLoadBalancerDefinition.class)} - ) + ) private LoadBalancerDefinition loadBalancerType; @XmlElementRef private List<ProcessorDefinition<?>> outputs = new ArrayList<ProcessorDefinition<?>>(); http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java index ddd53a4..4453ef5 100644 --- a/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java @@ -77,41 +77,41 @@ public class MarshalDefinition extends NoOutputDefinition<MarshalDefinition> { // cannot use @XmlElementRef as it doesn't allow optional properties @XmlElements({ - @XmlElement(required = false, name = "avro", type = AvroDataFormat.class), - @XmlElement(required = false, name = "base64", type = Base64DataFormat.class), - @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class), - @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class), - @XmlElement(required = false, name = "boon", type = BoonDataFormat.class), - @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), - @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), - @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), - @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), - @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class), - @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class), - @XmlElement(required = false, name = "ical", type = IcalDataFormat.class), - @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class), - @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class), - @XmlElement(required = false, name = "json", type = JsonDataFormat.class), - @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class), - @XmlElement(required = false, name = "rss", type = RssDataFormat.class), - @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class), - @XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class), - @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class), - @XmlElement(required = false, name = "string", type = StringDataFormat.class), - @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class), - @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class), - @XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class), - @XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class), - @XmlElement(required = false, name = "univocity-tsv", type = UniVocityTsvDataFormat.class), - @XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class), - @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class), - @XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class), - @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class), - @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class), - @XmlElement(required = false, name = "zip", type = ZipDataFormat.class), - @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)} - ) + @XmlElement(required = false, name = "avro", type = AvroDataFormat.class), + @XmlElement(required = false, name = "base64", type = Base64DataFormat.class), + @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class), + @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class), + @XmlElement(required = false, name = "boon", type = BoonDataFormat.class), + @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), + @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), + @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), + @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), + @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), + @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class), + @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class), + @XmlElement(required = false, name = "ical", type = IcalDataFormat.class), + @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class), + @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class), + @XmlElement(required = false, name = "json", type = JsonDataFormat.class), + @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class), + @XmlElement(required = false, name = "rss", type = RssDataFormat.class), + @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class), + @XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class), + @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class), + @XmlElement(required = false, name = "string", type = StringDataFormat.class), + @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class), + @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class), + @XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class), + @XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class), + @XmlElement(required = false, name = "univocity-tsv", type = UniVocityTsvDataFormat.class), + @XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class), + @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class), + @XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class), + @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class), + @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class), + @XmlElement(required = false, name = "zip", type = ZipDataFormat.class), + @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)} + ) private DataFormatDefinition dataFormatType; @XmlAttribute http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java index c6b6ed5..f74abee 100644 --- a/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/ResequenceDefinition.java @@ -53,9 +53,9 @@ import org.apache.camel.util.ObjectHelper; public class ResequenceDefinition extends ProcessorDefinition<ResequenceDefinition> { @Metadata(required = "false") @XmlElements({ - @XmlElement(name = "batch-config", type = BatchResequencerConfig.class), - @XmlElement(name = "stream-config", type = StreamResequencerConfig.class)} - ) + @XmlElement(name = "batch-config", type = BatchResequencerConfig.class), + @XmlElement(name = "stream-config", type = StreamResequencerConfig.class)} + ) private ResequencerConfig resequencerConfig; @XmlTransient private BatchResequencerConfig batchConfig; http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java index de2684f..1914a49 100644 --- a/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java @@ -77,41 +77,41 @@ public class UnmarshalDefinition extends NoOutputDefinition<UnmarshalDefinition> // cannot use @XmlElementRef as it doesn't allow optional properties @XmlElements({ - @XmlElement(required = false, name = "avro", type = AvroDataFormat.class), - @XmlElement(required = false, name = "base64", type = Base64DataFormat.class), - @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class), - @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class), - @XmlElement(required = false, name = "boon", type = BoonDataFormat.class), - @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), - @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), - @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), - @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), - @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), - @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class), - @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class), - @XmlElement(required = false, name = "ical", type = IcalDataFormat.class), - @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class), - @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class), - @XmlElement(required = false, name = "json", type = JsonDataFormat.class), - @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class), - @XmlElement(required = false, name = "rss", type = RssDataFormat.class), - @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class), - @XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class), - @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class), - @XmlElement(required = false, name = "string", type = StringDataFormat.class), - @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class), - @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class), - @XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class), - @XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class), - @XmlElement(required = false, name = "univocity-tsv", type = UniVocityTsvDataFormat.class), - @XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class), - @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class), - @XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class), - @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class), - @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class), - @XmlElement(required = false, name = "zip", type = ZipDataFormat.class), - @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)} - ) + @XmlElement(required = false, name = "avro", type = AvroDataFormat.class), + @XmlElement(required = false, name = "base64", type = Base64DataFormat.class), + @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class), + @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class), + @XmlElement(required = false, name = "boon", type = BoonDataFormat.class), + @XmlElement(required = false, name = "castor", type = CastorDataFormat.class), + @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class), + @XmlElement(required = false, name = "csv", type = CsvDataFormat.class), + @XmlElement(required = false, name = "custom", type = CustomDataFormat.class), + @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class), + @XmlElement(required = false, name = "gzip", type = GzipDataFormat.class), + @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class), + @XmlElement(required = false, name = "ical", type = IcalDataFormat.class), + @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class), + @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class), + @XmlElement(required = false, name = "json", type = JsonDataFormat.class), + @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class), + @XmlElement(required = false, name = "rss", type = RssDataFormat.class), + @XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class), + @XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class), + @XmlElement(required = false, name = "soapjaxb", type = SoapJaxbDataFormat.class), + @XmlElement(required = false, name = "string", type = StringDataFormat.class), + @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class), + @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class), + @XmlElement(required = false, name = "univocity-csv", type = UniVocityCsvDataFormat.class), + @XmlElement(required = false, name = "univocity-fixed", type = UniVocityFixedWidthDataFormat.class), + @XmlElement(required = false, name = "univocity-tsv", type = UniVocityTsvDataFormat.class), + @XmlElement(required = false, name = "xmlBeans", type = XMLBeansDataFormat.class), + @XmlElement(required = false, name = "xmljson", type = XmlJsonDataFormat.class), + @XmlElement(required = false, name = "xmlrpc", type = XmlRpcDataFormat.class), + @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class), + @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class), + @XmlElement(required = false, name = "zip", type = ZipDataFormat.class), + @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class)} + ) private DataFormatDefinition dataFormatType; @XmlAttribute http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java index 7438680..9c1fef8 100644 --- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java +++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java @@ -81,7 +81,7 @@ public class VerbDefinition extends OptionalIdentifiedDefinition<VerbDefinition> @XmlElements({ @XmlElement(required = false, name = "to", type = ToDefinition.class), @XmlElement(required = false, name = "route", type = RouteDefinition.class)} - ) + ) private OptionalIdentifiedDefinition<?> toOrRoute; // the Java DSL uses the to or route definition directory http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java index fbec104..d08cfd9 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java +++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java @@ -1015,11 +1015,15 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor @Override public void purge() { // must acquire the shared aggregation lock to be able to purge - if (!optimisticLocking) { lock.lock(); } + if (!optimisticLocking) { + lock.lock(); + } try { super.purge(); } finally { - if (!optimisticLocking) { lock.unlock(); } + if (!optimisticLocking) { + lock.unlock(); + } } } @@ -1078,7 +1082,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor if (keys != null && !keys.isEmpty()) { // must acquire the shared aggregation lock to be able to trigger interval completion - if (!optimisticLocking) { lock.lock(); } + if (!optimisticLocking) { + lock.lock(); + } try { for (String key : keys) { boolean stolenInterval = false; @@ -1103,7 +1109,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor } } } finally { - if (!optimisticLocking) { lock.unlock(); } + if (!optimisticLocking) { + lock.unlock(); + } } } @@ -1395,7 +1403,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor // must acquire the shared aggregation lock to be able to trigger force completion int total = 0; - if (!optimisticLocking) { lock.lock(); } + if (!optimisticLocking) { + lock.lock(); + } try { Exchange exchange = aggregationRepository.get(camelContext, key); if (exchange != null) { @@ -1409,7 +1419,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor } } } finally { - if (!optimisticLocking) { lock.unlock(); } + if (!optimisticLocking) { + lock.unlock(); + } } LOG.trace("Completed force completion of group {}", key); @@ -1436,7 +1448,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor int total = 0; if (keys != null && !keys.isEmpty()) { // must acquire the shared aggregation lock to be able to trigger force completion - if (!optimisticLocking) { lock.lock(); } + if (!optimisticLocking) { + lock.lock(); + } total = keys.size(); try { for (String key : keys) { @@ -1452,7 +1466,9 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor } } } finally { - if (!optimisticLocking) { lock.unlock(); } + if (!optimisticLocking) { + lock.unlock(); + } } } LOG.trace("Completed force completion of all groups task"); http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java index 78c17bb..430055d 100644 --- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java +++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/MemoryAggregationRepository.java @@ -46,7 +46,9 @@ public class MemoryAggregationRepository extends ServiceSupport implements Optim } public Exchange add(CamelContext camelContext, String key, Exchange oldExchange, Exchange newExchange) { - if (!optimisticLocking) { throw new UnsupportedOperationException(); } + if (!optimisticLocking) { + throw new UnsupportedOperationException(); + } if (oldExchange == null) { if (cache.putIfAbsent(key, newExchange) != null) { throw new OptimisticLockingException(); @@ -60,7 +62,9 @@ public class MemoryAggregationRepository extends ServiceSupport implements Optim } public Exchange add(CamelContext camelContext, String key, Exchange exchange) { - if (optimisticLocking) { throw new UnsupportedOperationException(); } + if (optimisticLocking) { + throw new UnsupportedOperationException(); + } return cache.put(key, exchange); } http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/util/CamelContextStatDump.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelContextStatDump.java b/camel-core/src/main/java/org/apache/camel/util/CamelContextStatDump.java index ebe539a..b25b71c 100644 --- a/camel-core/src/main/java/org/apache/camel/util/CamelContextStatDump.java +++ b/camel-core/src/main/java/org/apache/camel/util/CamelContextStatDump.java @@ -107,7 +107,7 @@ public final class CamelContextStatDump { @XmlElementWrapper(name = "routeStats") @XmlElements({ @XmlElement(type = RouteStatDump.class, name = "routeStat") - }) + }) private List<RouteStatDump> routeStats; public String getId() { http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java index 368b4c7..5c630b2 100644 --- a/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/CamelVersionHelper.java @@ -20,6 +20,9 @@ package org.apache.camel.util; * A simple util to test Camel versions. */ public final class CamelVersionHelper { + private CamelVersionHelper() { + //utility class, never constructed + } /** * Checks whether other >= base http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/util/MessageDump.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageDump.java b/camel-core/src/main/java/org/apache/camel/util/MessageDump.java index a9edffc..ee55f45 100644 --- a/camel-core/src/main/java/org/apache/camel/util/MessageDump.java +++ b/camel-core/src/main/java/org/apache/camel/util/MessageDump.java @@ -110,8 +110,8 @@ public final class MessageDump { @XmlElementWrapper(name = "headers") @XmlElements({ - @XmlElement(type = Header.class, name = "header") - }) + @XmlElement(type = Header.class, name = "header") + }) private List<Header> headers; @XmlElementRef http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java b/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java index d27f4b8..8531195 100644 --- a/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java +++ b/camel-core/src/main/java/org/apache/camel/util/RouteStatDump.java @@ -107,7 +107,7 @@ public final class RouteStatDump { @XmlElementWrapper(name = "processorStats") @XmlElements({ @XmlElement(type = ProcessorStatDump.class, name = "processorStat") - }) + }) private List<ProcessorStatDump> processorStats; public String getId() { http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/test/java/org/apache/camel/component/bean/CamelCustomer.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/bean/CamelCustomer.java b/camel-core/src/test/java/org/apache/camel/component/bean/CamelCustomer.java index 1464280..ea6a401 100644 --- a/camel-core/src/test/java/org/apache/camel/component/bean/CamelCustomer.java +++ b/camel-core/src/test/java/org/apache/camel/component/bean/CamelCustomer.java @@ -17,6 +17,10 @@ package org.apache.camel.component.bean; public class CamelCustomer { + public CamelCustomer() { + } + public void extraMethod() { + } public static boolean isGoldCustomer(String body) { return body.contains("Camel"); http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java index 19dd76d..219b6c2 100644 --- a/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java +++ b/camel-core/src/test/java/org/apache/camel/util/component/ApiMethodHelperTest.java @@ -193,19 +193,29 @@ public class ApiMethodHelperTest { } @Override - public String getName() { return apiMethod.getName(); } + public String getName() { + return apiMethod.getName(); + } @Override - public Class<?> getResultType() { return apiMethod.getResultType(); } + public Class<?> getResultType() { + return apiMethod.getResultType(); + } @Override - public List<String> getArgNames() { return apiMethod.getArgNames(); } + public List<String> getArgNames() { + return apiMethod.getArgNames(); + } @Override - public List<Class<?>> getArgTypes() { return apiMethod.getArgTypes(); } + public List<Class<?>> getArgTypes() { + return apiMethod.getArgTypes(); + } @Override - public Method getMethod() { return apiMethod.getMethod(); } + public Method getMethod() { + return apiMethod.getMethod(); + } } } http://git-wip-us.apache.org/repos/asf/camel/blob/17d39d90/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java ---------------------------------------------------------------------- diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java index 61daf5d..6de021d 100644 --- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java +++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java @@ -32,6 +32,9 @@ import static org.apache.camel.tools.apt.JsonSchemaHelper.parseJsonSchema; * Helper to find documentation for inherited options when a component extends another. */ public final class DocumentationHelper { + private DocumentationHelper() { + //utility class, never constructed + } public static String findComponentJavaDoc(String scheme, String extendsScheme, String fieldName) { File file = jsonFile(scheme, extendsScheme);
