Author: cschneider
Date: Thu Jul 28 15:42:27 2011
New Revision: 1151898
URL: http://svn.apache.org/viewvc?rev=1151898&view=rev
Log:
fixed some checkstyle errors
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThreadPoolProfileSupport.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DefaultTimeoutMapTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultThreadPoolFactory.java
Thu Jul 28 15:42:27 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
package org.apache.camel.impl;
import java.util.concurrent.BlockingQueue;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThreadPoolProfileSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThreadPoolProfileSupport.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThreadPoolProfileSupport.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ThreadPoolProfileSupport.java
Thu Jul 28 15:42:27 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
package org.apache.camel.impl;
import org.apache.camel.spi.ThreadPoolProfile;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
Thu Jul 28 15:42:27 2011
@@ -150,7 +150,7 @@ public class AggregateDefinition extends
Expression correlation =
getExpression().createExpression(routeContext);
AggregationStrategy strategy = createAggregationStrategy(routeContext);
- if (executorService == null) {
+ if (executorService == null) {
// executor service is mandatory for the Aggregator
ExecutorServiceManager executorServiceManager =
routeContext.getCamelContext().getExecutorServiceManager();
if (isParallelProcessing()) {
@@ -158,7 +158,7 @@ public class AggregateDefinition extends
} else {
executorService =
executorServiceManager.newSynchronousExecutorService(executorServiceRef, this);
}
- }
+ }
AggregateProcessor answer = new
AggregateProcessor(routeContext.getCamelContext(), processor, correlation,
strategy, executorService);
AggregationRepository repository =
createAggregationRepository(routeContext);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
Thu Jul 28 15:42:27 2011
@@ -124,8 +124,8 @@ public class RecipientListDefinition<Typ
answer.setTimeout(getTimeout());
}
if (isParallelProcessing() && executorService == null) {
- executorService =
routeContext.getCamelContext().getExecutorServiceManager().getDefaultExecutorService(executorServiceRef,
this);
- }
+ executorService =
routeContext.getCamelContext().getExecutorServiceManager().getDefaultExecutorService(executorServiceRef,
this);
+ }
answer.setExecutorService(executorService);
long timeout = getTimeout() != null ? getTimeout() : 0;
if (timeout > 0 && !isParallelProcessing()) {
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceFactory.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ExecutorServiceFactory.java
Thu Jul 28 15:42:27 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
package org.apache.camel.spi;
import java.util.concurrent.ExecutorService;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolFactory.java
Thu Jul 28 15:42:27 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
package org.apache.camel.spi;
import java.util.concurrent.ExecutorService;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/spi/ThreadPoolProfile.java
Thu Jul 28 15:42:27 2011
@@ -238,29 +238,29 @@ public class ThreadPoolProfile {
/**
* Overwrites each attribute that is null with the attribute from
defaultProfile
*
- * @param _defaultProfile
+ * @param defaultProfile2
*/
- public void addDefaults(ThreadPoolProfile _defaultProfile) {
- if (_defaultProfile == null) {
+ public void addDefaults(ThreadPoolProfile defaultProfile2) {
+ if (defaultProfile2 == null) {
return;
}
if (poolSize == null) {
- poolSize = _defaultProfile.getPoolSize();
+ poolSize = defaultProfile2.getPoolSize();
}
if (maxPoolSize == null) {
- maxPoolSize = _defaultProfile.getMaxPoolSize();
+ maxPoolSize = defaultProfile2.getMaxPoolSize();
}
if (keepAliveTime == null) {
- keepAliveTime = _defaultProfile.getKeepAliveTime();
+ keepAliveTime = defaultProfile2.getKeepAliveTime();
}
if (timeUnit == null) {
- timeUnit = _defaultProfile.getTimeUnit();
+ timeUnit = defaultProfile2.getTimeUnit();
}
if (maxQueueSize == null) {
- maxQueueSize = _defaultProfile.getMaxQueueSize();
+ maxQueueSize = defaultProfile2.getMaxQueueSize();
}
if (rejectedPolicy == null) {
- rejectedPolicy = _defaultProfile.getRejectedPolicy();
+ rejectedPolicy = defaultProfile2.getRejectedPolicy();
}
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/CamelThreadFactory.java
Thu Jul 28 15:42:27 2011
@@ -1,3 +1,19 @@
+/**
+ * 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.
+ */
package org.apache.camel.util.concurrent;
import java.util.concurrent.ThreadFactory;
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/util/concurrent/ThreadHelper.java
Thu Jul 28 15:42:27 2011
@@ -1,14 +1,33 @@
+/**
+ * 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.
+ */
package org.apache.camel.util.concurrent;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.camel.util.ObjectHelper;
-public class ThreadHelper {
+public final class ThreadHelper {
public static final String DEFAULT_PATTERN = "Camel Thread ${counter} -
${name}";
private static AtomicLong threadCounter = new AtomicLong();
+ private ThreadHelper() {
+ }
+
private static long nextThreadCounter() {
return threadCounter.getAndIncrement();
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DefaultTimeoutMapTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/DefaultTimeoutMapTest.java?rev=1151898&r1=1151897&r2=1151898&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DefaultTimeoutMapTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/util/DefaultTimeoutMapTest.java
Thu Jul 28 15:42:27 2011
@@ -21,13 +21,13 @@ import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
+import junit.framework.TestCase;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.ThreadPoolBuilder;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.spi.ThreadPoolProfile;
-import junit.framework.TestCase;
-
/**
* @version
*/
