You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/02/10 20:21:38 UTC
svn commit: r908639 - in /tuscany/sca-java-2.x/trunk/modules/builder/src:
main/java/org/apache/tuscany/sca/builder/impl/
test/java/org/apache/tuscany/sca/builder/impl/
Author: rfeng
Date: Wed Feb 10 19:21:20 2010
New Revision: 908639
URL: http://svn.apache.org/viewvc?rev=908639&view=rev
Log:
Fix some of minor bugs discovered by FindBugs
Modified:
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java
tuscany/sca-java-2.x/trunk/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/CompositeIncludeBuilderImpl.java Wed Feb 10 19:21:20 2010
@@ -84,7 +84,7 @@
for (Component component : merged.getComponents()) {
// apply the autowire flag on this composite to any inline
// components - Assembly 5.6 point 4
- if (component.getAutowire() == null && merged.getAutowire() == Boolean.TRUE) {
+ if (component.getAutowire() == null && Boolean.TRUE.equals(merged.getAutowire())) {
component.setAutowire(Boolean.TRUE);
}
// Merge the intents and policySets from the included composite into
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/EndpointReferenceBuilderImpl.java Wed Feb 10 19:21:20 2010
@@ -47,6 +47,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.Intent;
+import org.oasisopen.sca.ServiceRuntimeException;
/**
* Creates endpoint reference models.
@@ -195,7 +196,7 @@
// This autowire processing really needs to move to the matching
// algorithm but dependency problems means it has to stay here for now
- if (reference.getAutowire() == Boolean.TRUE && reference.getTargets().isEmpty()) {
+ if (Boolean.TRUE.equals(reference.getAutowire()) && reference.getTargets().isEmpty()) {
// Find suitable targets in the current composite for an
// autowired reference
Multiplicity multiplicity = reference.getMultiplicity();
@@ -475,7 +476,7 @@
try {
epRefClone = (EndpointReference)epRef.clone();
} catch (Exception e) {
- // Ignore (we know that EndpointReference2 can be cloned)
+ throw new ServiceRuntimeException(e);
} // end try
// Copy across details of the inner reference
//ComponentReference ref = epRefClone.getReference();
@@ -517,7 +518,7 @@
} else {
// no error if reference is autowire and more targets
// than multiplicity have been found
- if (componentReference.getAutowire() == Boolean.TRUE) {
+ if (Boolean.TRUE.equals(componentReference.getAutowire())) {
break;
}
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/ModelBuilderImpl.java Wed Feb 10 19:21:20 2010
@@ -32,7 +32,6 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
public class ModelBuilderImpl implements CompositeBuilder {
private ExtensionPointRegistry registry;
@@ -88,7 +87,6 @@
public Composite build(Composite composite, BuilderContext context)
throws CompositeBuilderException {
- Monitor monitor = context.getMonitor();
try {
// Clone the composites that are included or referenced in implementation.composite
composite = compositeCloneBuilder.build(composite, context);
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireBuilderImpl.java Wed Feb 10 19:21:20 2010
@@ -49,6 +49,7 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.policy.Intent;
+import org.oasisopen.sca.ServiceRuntimeException;
/**
* Creates endpoint reference models.
@@ -330,7 +331,7 @@
// Get reference targets
List<ComponentService> refTargets = getReferenceTargets(reference);
- if (reference.getAutowire() == Boolean.TRUE && reference.getTargets().isEmpty()) {
+ if (Boolean.TRUE.equals(reference.getAutowire()) && reference.getTargets().isEmpty()) {
// Find suitable targets in the current composite for an
// autowired reference
@@ -703,10 +704,11 @@
try {
epRefClone = (EndpointReference)epRef.clone();
} catch (Exception e) {
+ throw new ServiceRuntimeException(e);
// Ignore (we know that EndpointReference2 can be cloned)
} // end try
// Copy across details of the inner reference
- ComponentReference ref = epRefClone.getReference();
+ // ComponentReference ref = epRefClone.getReference();
//FIXME
epRefClone.setReference(promotedReference);
return epRefClone;
@@ -738,7 +740,7 @@
} else {
// no error if reference is autowire and more targets
// than multiplicity have been found
- if (componentReference.getAutowire() == Boolean.TRUE) {
+ if (Boolean.TRUE.equals(componentReference.getAutowire())) {
break;
}
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/main/java/org/apache/tuscany/sca/builder/impl/WireMatcherImpl.java Wed Feb 10 19:21:20 2010
@@ -34,7 +34,6 @@
*
*/
public class WireMatcherImpl implements WireBuilder {
- private ExtensionPointRegistry registry;
private InterfaceContractMapper interfaceContractMapper;
private BuilderExtensionPoint builderExtensionPoint;
@@ -43,7 +42,6 @@
*/
public WireMatcherImpl(ExtensionPointRegistry registry) {
super();
- this.registry = registry;
this.builderExtensionPoint = registry.getExtensionPoint(BuilderExtensionPoint.class);
UtilityExtensionPoint utilities = registry.getExtensionPoint(UtilityExtensionPoint.class);
this.interfaceContractMapper = utilities.getUtility(InterfaceContractMapper.class);
Modified: tuscany/sca-java-2.x/trunk/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java?rev=908639&r1=908638&r2=908639&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/builder/src/test/java/org/apache/tuscany/sca/builder/impl/BuildPolicyTestCase.java Wed Feb 10 19:21:20 2010
@@ -45,7 +45,6 @@
import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.definitions.Definitions;
import org.apache.tuscany.sca.monitor.Monitor;
@@ -73,7 +72,6 @@
public static void setUp() throws Exception {
DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
context = new ProcessorContext(extensionPoints);
- FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
compositeBuilder =
extensionPoints.getExtensionPoint(BuilderExtensionPoint.class)