Author: jmarino
Date: Tue Apr 18 19:09:52 2006
New Revision: 395106
URL: http://svn.apache.org/viewcvs?rev=395106&view=rev
Log:
remove required attribute from autowire annotation
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.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/injection/AutowireObjectFactory.java
Modified:
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java?rev=395106&r1=395105&r2=395106&view=diff
==============================================================================
---
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
(original)
+++
incubator/tuscany/java/sca/containers/container.java/src/main/java/org/apache/tuscany/container/java/loader/JavaImplementationLoader.java
Tue Apr 18 19:09:52 2006
@@ -61,12 +61,12 @@
xmlFactory = XMLInputFactory.newInstance();
}
- @Autowire(required = true)
+ @Autowire
public void setRegistry(StAXLoaderRegistry registry) {
this.registry = registry;
}
- @Autowire(required = true)
+ @Autowire
public void setFactory(JavaAssemblyFactory factory) {
this.factory = factory;
introspector = new Java5ComponentTypeIntrospector(factory);
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java?rev=395106&r1=395105&r2=395106&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AbstractCompositeContext.java
Tue Apr 18 19:09:52 2006
@@ -75,7 +75,7 @@
protected CompositeContext parentContext;
// The parent configuration context, if one exists
- @Autowire(required = false)
+ @Autowire
protected ConfigurationContext configurationContext;
// The logical model representing the module assembly
@@ -110,7 +110,7 @@
private final Map<Class, NameToScope> autowireInternal = new
ConcurrentHashMap<Class, NameToScope>();
private final Map<Class, NameToScope> autowireExternal = new
ConcurrentHashMap<Class, NameToScope>();
- @Autowire(required = false)
+ @Autowire
private AutowireContext autowireContext;
public AbstractCompositeContext() {
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java?rev=395106&r1=395105&r2=395106&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/CompositeContextImpl.java
Tue Apr 18 19:09:52 2006
@@ -40,7 +40,7 @@
*/
public class CompositeContextImpl extends AbstractCompositeContext implements
ModuleContext {
- @Autowire(required = false)
+ @Autowire
public void setScopeStrategy(ScopeStrategy scopeStrategy) {
if (scopeStrategy != null) {
this.scopeStrategy = scopeStrategy;
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java?rev=395106&r1=395105&r2=395106&view=diff
==============================================================================
---
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
(original)
+++
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/system/annotation/Autowire.java
Tue Apr 18 19:09:52 2006
@@ -14,7 +14,5 @@
@Target( { METHOD, FIELD })
@Retention(RUNTIME)
public @interface Autowire {
-
- public boolean required() default true;
}
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=395106&r1=395105&r2=395106&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
Tue Apr 18 19:09:52 2006
@@ -219,8 +219,7 @@
e.setIdentifier(field.getType().getName());
throw e;
}
- Injector<?> injector = new FieldInjector(field, new
AutowireObjectFactory(field.getType(), autowire.required(),
- contextFactory));
+ Injector<?> injector = new FieldInjector(field, new
AutowireObjectFactory(field.getType(), contextFactory));
injectors.add(injector);
}
Monitor monitor = field.getAnnotation(Monitor.class);
@@ -284,8 +283,7 @@
e.setIdentifier(paramType.getName());
throw e;
}
- Injector injector = new MethodInjector(method, new
AutowireObjectFactory(paramType, autowire.required(),
- contextFactory));
+ Injector injector = new MethodInjector(method, new
AutowireObjectFactory(paramType, contextFactory));
injectors.add(injector);
}
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=395106&r1=395105&r2=395106&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
Tue Apr 18 19:09:52 2006
@@ -31,16 +31,13 @@
private Class<T> autowireType;
- private boolean required;
-
/**
*
* @throws FactoryInitException
*/
- public AutowireObjectFactory(Class<T> autowireType, boolean required,
ContextResolver resolver) {
+ public AutowireObjectFactory(Class<T> autowireType,ContextResolver
resolver) {
assert (autowireType != null) : "Target interface was null";
this.resolver = resolver;
- this.required = required;
this.autowireType = autowireType;
}
@@ -50,7 +47,7 @@
* @throws FactoryInitException
*/
public AutowireObjectFactory(Class<T> implementationType) {
- this(implementationType, true, null);
+ this(implementationType, null);
}
public T getInstance() throws ObjectCreationException {
