Author: jmarino
Date: Mon Mar 20 11:53:19 2006
New Revision: 387289
URL: http://svn.apache.org/viewcvs?rev=387289&view=rev
Log:
code and javadoc cleanup around system components
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
(original)
+++
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/context/JavaComponentContext.java
Mon Mar 20 11:53:19 2006
@@ -16,8 +16,6 @@
*/
package org.apache.tuscany.container.java.context;
-import java.util.Iterator;
-
import org.apache.tuscany.core.builder.ObjectFactory;
import org.apache.tuscany.core.context.AbstractContext;
import org.apache.tuscany.core.context.Context;
@@ -27,7 +25,6 @@
import org.apache.tuscany.core.context.SimpleComponentContext;
import org.apache.tuscany.core.context.TargetException;
import org.apache.tuscany.core.injection.EventInvoker;
-import org.apache.tuscany.core.injection.Injector;
import org.apache.tuscany.core.injection.ObjectCallbackException;
import org.apache.tuscany.core.injection.ObjectCreationException;
@@ -44,10 +41,6 @@
private EventInvoker destroyInvoker;
- private Injector componentName;
-
- private Injector moduleContext;
-
private boolean stateless;
// the cached target instance
@@ -64,7 +57,7 @@
EventInvoker destroyInvoker, boolean stateless) {
super(name);
assert (objectFactory != null) : "Object factory was null";
- if (eagerInit == true && initInvoker == null) {
+ if (eagerInit && initInvoker == null) {
ContextInitException e = new ContextInitException("No
intialization method found for implementation");
e.setIdentifier(getName());
throw e;
@@ -113,9 +106,8 @@
Object instance = objectFactory.getInstance();
startInstance(instance);
if (notify) {
- for (Iterator iter = contextListener.iterator();
iter.hasNext();) {
- LifecycleEventListener listener =
(LifecycleEventListener) iter.next();
- listener.onInstanceCreate(this);
+ for (LifecycleEventListener aContextListener :
contextListener) {
+ aContextListener.onInstanceCreate(this);
}
}
setLifecycleState(RUNNING);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemContextFactoryBuilder.java
Mon Mar 20 11:53:19 2006
@@ -102,7 +102,7 @@
Component component = (Component) modelObject;
Class implClass = null;
- Scope scope = null;
+ Scope scope;
// Get the component implementation
ComponentImplementation componentImplementation =
component.getComponentImplementation();
if (componentImplementation instanceof SystemImplementation &&
componentImplementation.getContextFactory() == null) {
@@ -155,7 +155,7 @@
}
Set<Field> fields;
Set<Method> methods;
- SystemContextFactory contextFactory = null;
+ SystemContextFactory contextFactory;
try {
fields = JavaIntrospectionHelper.getAllFields(implClass);
methods = JavaIntrospectionHelper.getAllUniqueMethods(implClass);
@@ -170,7 +170,7 @@
}
ContextObjectFactory contextObjectFactory = new
ContextObjectFactory(contextFactory);
- List<Injector> injectors = new ArrayList();
+ List<Injector> injectors = new ArrayList<Injector>();
// handle properties
List<ConfiguredProperty> configuredProperties =
component.getConfiguredProperties();
@@ -200,7 +200,7 @@
for (Field field : fields) {
ComponentName compName =
field.getAnnotation(ComponentName.class);
if (compName != null) {
- Injector injector = new FieldInjector(field, new
SingletonObjectFactory(name));
+ Injector injector = new FieldInjector(field, new
SingletonObjectFactory<String>(name));
injectors.add(injector);
}
Context context = field.getAnnotation(Context.class);
@@ -245,7 +245,7 @@
}
ComponentName compName =
method.getAnnotation(ComponentName.class);
if (compName != null) {
- Injector injector = new MethodInjector(method, new
SingletonObjectFactory(name));
+ Injector injector = new MethodInjector(method, new
SingletonObjectFactory<String>(name));
injectors.add(injector);
}
Context context = method.getAnnotation(Context.class);
@@ -333,7 +333,7 @@
throw new NoAccessorException(propName);
}
}
- Injector injector = null;
+ Injector injector;
// FIXME support types other than String
if (value instanceof DataObject) {
if (field != null) {
@@ -365,14 +365,13 @@
private Injector createReferenceInjector(ConfiguredReference reference,
Set<Field> fields, Set<Method> methods,
ContextResolver resolver) {
- List<ObjectFactory> objectFactories = new ArrayList();
+ List<ObjectFactory> objectFactories = new ArrayList<ObjectFactory>();
String refName = reference.getReference().getName();
Class refClass =
reference.getReference().getServiceContract().getInterface();
for (ConfiguredService configuredService :
reference.getTargetConfiguredServices()) {
String targetCompName =
configuredService.getAggregatePart().getName();
String targetSerivceName =
configuredService.getService().getName();
QualifiedName qName = new QualifiedName(targetCompName +
QualifiedName.NAME_SEPARATOR + targetSerivceName);
- Class interfaze =
reference.getReference().getServiceContract().getInterface();
objectFactories.add(new NonProxiedTargetFactory(configuredService,
resolver));
}
boolean multiplicity = reference.getReference().getMultiplicity() ==
Multiplicity.ONE_N
@@ -386,7 +385,7 @@
*/
private Injector createInjector(String refName, Class refClass, boolean
multiplicity, List<ObjectFactory> objectFactories,
Set<Field> fields, Set<Method> methods) throws
NoAccessorException, BuilderConfigException {
- Field field = null;
+ Field field;
Method method = null;
if (multiplicity) {
// since this is a multiplicity, we cannot match on business
interface type, so scan through the fields,
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/builder/SystemEntryPointBuilder.java
Mon Mar 20 11:53:19 2006
@@ -52,9 +52,7 @@
return;
}
try {
- // Class type =
entryPoint.getConfiguredReference().getReference().getServiceContract().getInterface();
-
- String targetName = null;
+ String targetName;
ConfiguredService targetService =
entryPoint.getConfiguredReference().getTargetConfiguredServices().get(0);
if (targetService.getAggregatePart() == null) {
// FIXME not correct
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/config/SystemObjectContextFactory.java
Mon Mar 20 11:53:19 2006
@@ -49,7 +49,7 @@
*/
public SystemObjectContextFactory(String name, Object instance) {
this.name = name;
- objectFactory = new SingletonObjectFactory(instance);
+ objectFactory = new SingletonObjectFactory<Object>(instance);
}
public Context createContext() throws ContextCreationException {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemComponentContext.java
Mon Mar 20 11:53:19 2006
@@ -44,10 +44,6 @@
private EventInvoker destroyInvoker;
- private Injector componentName;
-
- private Injector moduleContext;
-
private boolean stateless;
// the cached target instance
@@ -64,7 +60,7 @@
EventInvoker destroyInvoker, boolean stateless) {
super(name);
assert (objectFactory != null) : "Object factory was null";
- if (eagerInit == true && initInvoker == null) {
+ if (eagerInit && initInvoker == null) {
throw new AssertionError("No intialization method found for eager
init implementation");
}
this.objectFactory = objectFactory;
@@ -110,9 +106,8 @@
Object instance = objectFactory.getInstance();
startInstance(instance);
if (notify) {
- for (Iterator iter = contextListener.iterator();
iter.hasNext();) {
- LifecycleEventListener listener =
(LifecycleEventListener) iter.next();
- listener.onInstanceCreate(this);
+ for (LifecycleEventListener aContextListener :
contextListener) {
+ aContextListener.onInstanceCreate(this);
}
}
setLifecycleState(RUNNING);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/context/SystemScopeStrategy.java
Mon Mar 20 11:53:19 2006
@@ -30,9 +30,9 @@
/**
* Implements a [EMAIL PROTECTED]
org.apache.tuscany.core.context.ScopeStrategy} for a system aggregate context
with the following scopes:
* <ul>
- * <li>[EMAIL PROTECTED] org.apache.tuscany.model.assembly.Scope#AGGREGATE</li>
- * <li>[EMAIL PROTECTED] org.apache.tuscany.model.assembly.Scope#MODULE</li>
- * <li>[EMAIL PROTECTED] org.apache.tuscany.model.assembly.Scope#INSTANCE</li>
+ * <li>[EMAIL PROTECTED]
org.apache.tuscany.model.assembly.Scope#AGGREGATE}</li>
+ * <li>[EMAIL PROTECTED] org.apache.tuscany.model.assembly.Scope#MODULE}</li>
+ * <li>[EMAIL PROTECTED] org.apache.tuscany.model.assembly.Scope#INSTANCE}</li>
* </ul>
*
* @version $Rev$ $Date$
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/injection/AutowireObjectFactory.java
Mon Mar 20 11:53:19 2006
@@ -59,20 +59,20 @@
if (parent == null) {
return null;// FIXME semantic here means required is not followed
}
- if (parent != null && !(parent instanceof AutowireContext)) {
+ if (!(parent instanceof AutowireContext)) {
ObjectCreationException e = new ObjectCreationException("Parent
does not implement "
+ AutowireContext.class.getName());
e.setIdentifier(parent.getName());
throw e;
}
AutowireContext ctx = (AutowireContext) parent;
- if (ctx == null && required) {
- AutowireResolutionException e = new
AutowireResolutionException("Required autowire not found");
- e.setIdentifier(autowireType.getName());
- throw e;
- } else if (ctx == null) {
- return null;
- }
+// if (ctx == null && required) {
+// AutowireResolutionException e = new
AutowireResolutionException("Required autowire not found");
+// e.setIdentifier(autowireType.getName());
+// throw e;
+// } else if (ctx == null) {
+// return null;
+// }
return (T) ctx.resolveInstance(autowireType);
}
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/builder/SystemComponentImpl.java
Mon Mar 20 11:53:19 2006
@@ -91,7 +91,7 @@
}
public boolean initialized(){
- return (inited == true);
+ return (inited);
}
private boolean destroyed;
@@ -102,7 +102,7 @@
}
public boolean destroyed(){
- return (destroyed == true);
+ return (destroyed);
}
@Property
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/IntraAggregateWireTestCase.java
Mon Mar 20 11:53:19 2006
@@ -44,7 +44,6 @@
Assert.assertNotNull(targetRef);
Target target = (Target)
context.getContext("target").getImplementationInstance();
Assert.assertSame(target, targetRef);
- Source source2 = (Source)
context.getContext("source").getImplementationInstance();
Assert.assertSame(target, source.getTarget());
context.fireEvent(EventContext.MODULE_STOP, null);
context.stop();
@@ -61,7 +60,6 @@
Assert.assertNotNull(targetRef);
Target target = (Target)
context.getContext("target").getImplementationInstance();
Assert.assertSame(target, targetRef);
- Source source2 = (Source)
context.getContext("source").getImplementationInstance();
Assert.assertSame(target, source.getTarget());
context.fireEvent(EventContext.MODULE_STOP, null);
context.stop();
Modified:
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java?rev=387289&r1=387288&r2=387289&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
(original)
+++
incubator/tuscany/java/sca/core/src/test/java/org/apache/tuscany/core/system/context/SystemAggregateComponentContextRegisterTestCase.java
Mon Mar 20 11:53:19 2006
@@ -33,8 +33,7 @@
protected AggregateContext createContext() {
List<ContextFactoryBuilder> builders =
MockFactory.createSystemBuilders();
- AggregateContext moduleContext = new
SystemAggregateContextImpl("test.context", null,
+ return new SystemAggregateContextImpl("test.context", null,
null, new DefaultScopeStrategy(), new EventContextImpl(), new
MockConfigContext(builders), new NullMonitorFactory(), null, null);
- return moduleContext;
}
}
