Author: hadrian
Date: Tue Nov 10 19:15:21 2009
New Revision: 834605
URL: http://svn.apache.org/viewvc?rev=834605&view=rev
Log:
Long running effort to remove warnings
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java
Tue Nov 10 19:15:21 2009
@@ -52,5 +52,4 @@
}
}
}
-
}
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/ProcessBuilder.java
Tue Nov 10 19:15:21 2009
@@ -30,6 +30,7 @@
import org.apache.camel.bam.rules.ProcessRules;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.springframework.orm.jpa.JpaTemplate;
import org.springframework.transaction.TransactionStatus;
@@ -49,7 +50,7 @@
private TransactionTemplate transactionTemplate;
private String processName;
private List<ActivityBuilder> activityBuilders = new
ArrayList<ActivityBuilder>();
- private Class entityType = ProcessInstance.class;
+ private Class<ProcessInstance> entityType = ProcessInstance.class;
private ProcessRules processRules = new ProcessRules();
private ProcessDefinition processDefinition;
private ActivityMonitorEngine engine;
@@ -84,7 +85,7 @@
/**
* Sets the process entity type used to perform state management
*/
- public ProcessBuilder entityType(Class entityType) {
+ public ProcessBuilder entityType(Class<ProcessInstance> entityType) {
this.entityType = entityType;
return this;
}
@@ -105,7 +106,7 @@
return activityBuilders;
}
- public Class getEntityType() {
+ public Class<ProcessInstance> getEntityType() {
return entityType;
}
@@ -172,7 +173,8 @@
//
-------------------------------------------------------------------------
public ActivityDefinition findOrCreateActivityDefinition(String
activityName) {
ProcessDefinition definition = getProcessDefinition();
- List<ActivityDefinition> list = jpaTemplate.find("select x from " +
ActivityDefinition.class.getName() + " x where x.processDefinition = ?1 and
x.name = ?2", definition, activityName);
+ List<ActivityDefinition> list =
CastUtils.cast(jpaTemplate.find("select x from "
+ + ActivityDefinition.class.getName() + " x where
x.processDefinition = ?1 and x.name = ?2", definition, activityName));
if (!list.isEmpty()) {
return list.get(0);
} else {
@@ -185,7 +187,8 @@
}
protected ProcessDefinition findOrCreateProcessDefinition() {
- List<ProcessDefinition> list = jpaTemplate.find("select x from " +
ProcessDefinition.class.getName() + " x where x.name = ?1", processName);
+ List<ProcessDefinition> list = CastUtils.cast(jpaTemplate.find("select
x from "
+ + ProcessDefinition.class.getName() + " x where x.name = ?1",
processName));
if (!list.isEmpty()) {
return list.get(0);
} else {
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessDefinition.java
Tue Nov 10 19:15:21 2009
@@ -24,6 +24,7 @@
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import org.apache.camel.util.CastUtils;
import org.apache.camel.util.ObjectHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -73,7 +74,8 @@
}
public static ProcessDefinition findOrCreateProcessDefinition(JpaTemplate
template, String processName) {
- List<ProcessDefinition> list = template.find("select x from " +
ProcessDefinition.class.getName() + " x where x.name = ?1", processName);
+ List<ProcessDefinition> list = CastUtils.cast(template.find("select x
from "
+ + ProcessDefinition.class.getName() + " x where x.name = ?1",
processName));
if (!list.isEmpty()) {
return list.get(0);
} else {
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/model/ProcessInstance.java
Tue Nov 10 19:15:21 2009
@@ -32,8 +32,6 @@
import javax.persistence.Transient;
import org.apache.camel.bam.rules.ActivityRules;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Represents a single business process
@@ -45,7 +43,6 @@
name = "CAMEL_PROCESSINSTANCE"
)
public class ProcessInstance {
- private static final transient Log LOG =
LogFactory.getLog(ProcessInstance.class);
private ProcessDefinition processDefinition;
private Collection<ActivityState> activityStates = new
HashSet<ActivityState>();
private String correlationKey;
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/ActivityMonitorEngine.java
Tue Nov 10 19:15:21 2009
@@ -26,6 +26,7 @@
import org.apache.camel.bam.model.ActivityState;
import org.apache.camel.bam.rules.ProcessRules;
import org.apache.camel.impl.ServiceSupport;
+import org.apache.camel.util.CastUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -46,7 +47,6 @@
private JpaTemplate template;
private TransactionTemplate transactionTemplate;
private ProcessRules rules;
- private int escalateLevel;
private long windowMillis = 1000L;
private Thread thread;
private boolean useLocking;
@@ -76,8 +76,7 @@
transactionTemplate.execute(new
TransactionCallbackWithoutResult() {
protected void
doInTransactionWithoutResult(TransactionStatus status) {
- //List<ActivityState> list = template.find("select x
from " + ActivityState.class.getName() + " x where x.escalationLevel = ?1 and
x.timeOverdue < ?2", escalateLevel, timeNow);
- List<ActivityState> list = template.find("select x
from " + ActivityState.class.getName() + " x where x.timeOverdue < ?1",
timeNow);
+ List<ActivityState> list =
CastUtils.cast(template.find("select x from " + ActivityState.class.getName() +
" x where x.timeOverdue < ?1", timeNow));
for (ActivityState activityState : list) {
fireExpiredEvent(activityState);
}
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/BamProcessorSupport.java
Tue Nov 10 19:15:21 2009
@@ -16,6 +16,8 @@
*/
package org.apache.camel.bam.processor;
+import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
+
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -28,8 +30,6 @@
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionTemplate;
-import static org.apache.camel.util.ObjectHelper.wrapRuntimeCamelException;
-
/**
* A base {...@link Processor} for working on <a
* href="http://camel.apache.org/bam.html">BAM</a> which a derived
@@ -45,6 +45,7 @@
private int retryCount = 20;
private long retrySleep = 1000L;
+ @SuppressWarnings("unchecked")
protected BamProcessorSupport(TransactionTemplate transactionTemplate,
Expression correlationKeyExpression) {
this.transactionTemplate = transactionTemplate;
@@ -57,7 +58,7 @@
if (arguments.length > 0) {
Type argumentType = arguments[0];
if (argumentType instanceof Class) {
- this.entityType = (Class<T>)argumentType;
+ this.entityType = (Class<T>) argumentType;
}
}
}
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/JpaBamProcessorSupport.java
Tue Nov 10 19:15:21 2009
@@ -43,6 +43,7 @@
private static final transient Log LOG =
LogFactory.getLog(JpaBamProcessorSupport.class);
private static final Lock LOCK = new ReentrantLock(); // lock used for
concurrency issues
+
private ActivityRules activityRules;
private JpaTemplate template;
private String findByKeyQuery;
@@ -132,6 +133,7 @@
}
}
+ @SuppressWarnings("unchecked")
protected T findEntityByCorrelationKey(Object key) {
if (isCorrelationKeyIsPrimary()) {
return template.find(getEntityType(), key);
@@ -145,7 +147,7 @@
}
}
- protected Class getKeyType() {
+ protected Class<?> getKeyType() {
try {
Method getter =
IntrospectionSupport.getPropertyGetter(getEntityType(), getKeyPropertyName());
return getter.getReturnType();
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/processor/NoCorrelationKeyException.java
Tue Nov 10 19:15:21 2009
@@ -27,14 +27,15 @@
* @version $Revision$
*/
public class NoCorrelationKeyException extends CamelExchangeException {
- private final BamProcessorSupport processor;
+ private static final long serialVersionUID = 4511220911189364989L;
+ private final BamProcessorSupport<?> processor;
- public NoCorrelationKeyException(BamProcessorSupport processor, Exchange
exchange) {
+ public NoCorrelationKeyException(BamProcessorSupport<?> processor,
Exchange exchange) {
super("No correlation key could be found for " +
processor.getCorrelationKeyExpression(), exchange);
this.processor = processor;
}
- public BamProcessorSupport getProcessor() {
+ public BamProcessorSupport<?> getProcessor() {
return processor;
}
}
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/ActivityRules.java
Tue Nov 10 19:15:21 2009
@@ -26,8 +26,6 @@
import org.apache.camel.bam.model.ProcessInstance;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.util.ServiceHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* Represents a activity which is typically a system or could be an endpoint
@@ -35,11 +33,9 @@
* @version $Revision$
*/
public class ActivityRules extends ServiceSupport {
- private static final transient Log LOG =
LogFactory.getLog(ActivityRules.class);
private int expectedMessages = 1;
private ProcessRules processRules;
private List<TemporalRule> rules = new ArrayList<TemporalRule>();
- private ActivityDefinition activityDefinition;
private String activityName;
private final org.apache.camel.bam.ProcessBuilder builder;
@@ -77,7 +73,6 @@
}
public void setActivityDefinition(ActivityDefinition activityDefinition) {
- this.activityDefinition = activityDefinition;
}
public int getExpectedMessages() {
Modified:
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
(original)
+++
camel/trunk/components/camel-bam/src/main/java/org/apache/camel/bam/rules/TemporalRule.java
Tue Nov 10 19:15:21 2009
@@ -29,6 +29,7 @@
import org.apache.camel.impl.DefaultRouteContext;
import org.apache.camel.impl.ServiceSupport;
import org.apache.camel.model.OutputDefinition;
+import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RouteDefinition;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.Time;
@@ -50,7 +51,7 @@
private long expectedMillis;
private long overdueMillis;
private Processor overdueAction;
- private OutputDefinition overdueProcessors = new OutputDefinition();
+ private OutputDefinition<ProcessorDefinition<?>> overdueProcessors = new
OutputDefinition<ProcessorDefinition<?>>();
public TemporalRule(TimeExpression first, TimeExpression second) {
this.first = first;
@@ -66,15 +67,12 @@
return this;
}
- public OutputDefinition errorIfOver(Time builder) {
+ public OutputDefinition<ProcessorDefinition<?>> errorIfOver(Time builder) {
return errorIfOver(builder.toMillis());
}
- public OutputDefinition errorIfOver(long millis) {
+ public OutputDefinition<ProcessorDefinition<?>> errorIfOver(long millis) {
overdueMillis = millis;
- if (overdueProcessors == null) {
- overdueProcessors = new OutputDefinition();
- }
return overdueProcessors;
}
@@ -88,12 +86,10 @@
public Processor getOverdueAction() throws Exception {
if (overdueAction == null && overdueProcessors != null) {
-
- // TOOD refactor to avoid this messyness...
- ArrayList<Route> list = new ArrayList<Route>();
RouteDefinition route = new RouteDefinition();
route.setCamelContext(first.getBuilder().getProcessBuilder().getContext());
- RouteContext routeContext = new
DefaultRouteContext(first.getBuilder().getProcessBuilder().getContext(), route,
null, list);
+ RouteContext routeContext = new DefaultRouteContext(
+ first.getBuilder().getProcessBuilder().getContext(), route,
null, new ArrayList<Route>());
overdueAction =
overdueProcessors.createOutputsProcessor(routeContext);
}
@@ -103,7 +99,7 @@
public void processExchange(Exchange exchange, ProcessInstance instance) {
Date firstTime = first.evaluate(instance);
if (firstTime == null) {
- // ignore as first event has not accurred yet
+ // ignore as first event has not occurred yet
return;
}
Modified:
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java?rev=834605&r1=834604&r2=834605&view=diff
==============================================================================
---
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
(original)
+++
camel/trunk/components/camel-bam/src/test/java/org/apache/camel/bam/MultipleActivitiesConcurrentlyTest.java
Tue Nov 10 19:15:21 2009
@@ -20,7 +20,6 @@
import org.junit.Before;
import org.junit.Test;
-import static org.apache.camel.language.juel.JuelExpression.el;
/**
* @version $Revision$