Author: jmarino
Date: Fri Jan 5 01:58:28 2007
New Revision: 492954
URL: http://svn.apache.org/viewvc?view=rev&rev=492954
Log:
convert over to use @EagerInit
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/TransformerRegistryImpl.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WiringExceptionFormatterTestCase.java
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/builder/WiringExceptionFormatter.java
Fri Jan 5 01:58:28 2007
@@ -20,8 +20,9 @@
import java.io.PrintWriter;
+import org.osoa.sca.annotations.Constructor;
import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.annotation.Autowire;
import org.apache.tuscany.spi.builder.WiringException;
@@ -34,24 +35,17 @@
*
* @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class WiringExceptionFormatter implements ExceptionFormatter {
private FormatterRegistry factory;
- public WiringExceptionFormatter() {
+ public WiringExceptionFormatter(@Autowire FormatterRegistry factory) {
+ this.factory = factory;
+ factory.register(this);
}
public boolean canFormat(Class<?> type) {
return WiringException.class.isAssignableFrom(type);
- }
-
- @Autowire(required = false)
- public void setRegistry(FormatterRegistry factory) {
- this.factory = factory;
- }
-
- @Init(eager = true)
- public void init() {
- factory.register(this);
}
@Destroy
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/CompositeScopeObjectFactory.java
Fri Jan 5 01:58:28 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -34,6 +34,7 @@
*
* @version $$Rev$$ $$Date$$
*/
[EMAIL PROTECTED]
public class CompositeScopeObjectFactory implements
ObjectFactory<CompositeScopeContainer> {
private ScopeContainerMonitor monitor;
@@ -41,10 +42,6 @@
@Monitor ScopeContainerMonitor monitor)
{
registry.registerFactory(Scope.COMPOSITE, this);
this.monitor = monitor;
- }
-
- @Init(eager = true)
- public void init() {
}
public CompositeScopeContainer getInstance() throws
ObjectCreationException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/ConversationalScopeObjectFactory.java
Fri Jan 5 01:58:28 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -36,6 +36,7 @@
*
* @version $$Rev: 450456 $$ $$Date: 2006-09-27 10:28:36 -0400 (Wed, 27 Sep
2006) $$
*/
[EMAIL PROTECTED]
public class ConversationalScopeObjectFactory implements
ObjectFactory<ConversationalScopeContainer> {
private WorkContext context;
private Store store;
@@ -50,11 +51,6 @@
this.store = store;
this.monitor = monitor;
}
-
- @Init(eager = true)
- public void init() {
- }
-
public ConversationalScopeContainer getInstance() throws
ObjectCreationException {
return new ConversationalScopeContainer(store, context, monitor);
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeObjectFactory.java
Fri Jan 5 01:58:28 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -35,6 +35,7 @@
*
* @version $$Rev$$ $$Date$$
*/
[EMAIL PROTECTED]
public class HttpSessionScopeObjectFactory implements
ObjectFactory<HttpSessionScopeContainer> {
private WorkContext context;
private ScopeContainerMonitor monitor;
@@ -46,11 +47,6 @@
this.context = context;
this.monitor = monitor;
}
-
- @Init(eager = true)
- public void init() {
- }
-
public HttpSessionScopeContainer getInstance() throws
ObjectCreationException {
return new HttpSessionScopeContainer(context, monitor);
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/StatelessScopeObjectFactory.java
Fri Jan 5 01:58:28 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.core.component.scope;
-import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.EagerInit;
import org.apache.tuscany.spi.ObjectCreationException;
import org.apache.tuscany.spi.ObjectFactory;
@@ -35,6 +35,7 @@
*
* @version $$Rev$$ $$Date$$
*/
[EMAIL PROTECTED]
public class StatelessScopeObjectFactory implements
ObjectFactory<StatelessScopeContainer> {
private WorkContext context;
private ScopeContainerMonitor monitor;
@@ -45,10 +46,6 @@
registry.registerFactory(Scope.STATELESS, this);
this.context = context;
this.monitor = monitor;
- }
-
- @Init(eager = true)
- public void init() {
}
public StatelessScopeContainer getInstance() throws
ObjectCreationException {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingRegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingRegistryImpl.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingRegistryImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/DataBindingRegistryImpl.java
Fri Jan 5 01:58:28 2007
@@ -22,14 +22,18 @@
import java.util.HashMap;
import java.util.Map;
+import org.osoa.sca.annotations.EagerInit;
+
import org.apache.tuscany.spi.databinding.DataBinding;
import org.apache.tuscany.spi.databinding.DataBindingRegistry;
import org.apache.tuscany.spi.model.DataType;
-import org.osoa.sca.annotations.Init;
/**
* The default implementation of a data binding registry
+ *
+ * @version $Rev$ $Date$
*/
[EMAIL PROTECTED]
public class DataBindingRegistryImpl implements DataBindingRegistry {
private final Map<String, DataBinding> bindings = new HashMap<String,
DataBinding>();
@@ -51,12 +55,8 @@
return bindings.remove(id.toLowerCase());
}
- @Init(eager = true)
- public void init() {
- }
-
public DataType introspectType(Class<?> javaType) {
- DataType dataType = null;
+ DataType dataType;
for (DataBinding binding : bindings.values()) {
dataType = binding.introspect(javaType);
if (dataType != null) {
@@ -67,7 +67,7 @@
}
public DataType introspectType(Object value) {
- DataType dataType = null;
+ DataType dataType;
for (DataBinding binding : bindings.values()) {
dataType = binding.introspect(value);
if (dataType != null) {
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/TransformerRegistryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/TransformerRegistryImpl.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/TransformerRegistryImpl.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/databinding/impl/TransformerRegistryImpl.java
Fri Jan 5 01:58:28 2007
@@ -21,27 +21,28 @@
import java.util.ArrayList;
import java.util.List;
+import org.osoa.sca.annotations.EagerInit;
+
import org.apache.tuscany.spi.databinding.Transformer;
import org.apache.tuscany.spi.databinding.TransformerRegistry;
-import org.osoa.sca.annotations.Init;
+/**
+ * @version $Rev$ $Date$
+ */
[EMAIL PROTECTED]
public class TransformerRegistryImpl implements TransformerRegistry {
private final DirectedGraph<Object, Transformer> graph = new
DirectedGraph<Object, Transformer>();
- @Init(eager = true)
- public void init() {
- }
-
public void registerTransformer(String sourceType, String resultType, int
weight, Transformer transformer) {
graph.addEdge(sourceType, resultType, transformer, weight);
}
public void registerTransformer(Transformer transformer) {
graph.addEdge(transformer.getSourceDataBinding(),
- transformer.getTargetDataBinding(),
- transformer,
- transformer.getWeight());
+ transformer.getTargetDataBinding(),
+ transformer,
+ transformer.getWeight());
}
public boolean unregisterTransformer(String sourceType, String resultType)
{
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WiringExceptionFormatterTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WiringExceptionFormatterTestCase.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WiringExceptionFormatterTestCase.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/builder/WiringExceptionFormatterTestCase.java
Fri Jan 5 01:58:28 2007
@@ -24,12 +24,14 @@
import org.apache.tuscany.spi.builder.WiringException;
import junit.framework.TestCase;
+import org.apache.tuscany.host.monitor.FormatterRegistry;
+import org.easymock.EasyMock;
/**
* @version $Rev$ $Date$
*/
public class WiringExceptionFormatterTestCase extends TestCase {
- WiringExceptionFormatter formatter = new WiringExceptionFormatter();
+ WiringExceptionFormatter formatter = new
WiringExceptionFormatter(EasyMock.createNiceMock(FormatterRegistry.class));
public void testFormat() throws Exception {
WiringException e = new MockWiringException("message",
Modified:
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java?view=diff&rev=492954&r1=492953&r2=492954
==============================================================================
---
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
(original)
+++
incubator/tuscany/java/sca/kernel/core/src/test/java/org/apache/tuscany/core/component/scope/MockFactory.java
Fri Jan 5 01:58:28 2007
@@ -19,12 +19,11 @@
package org.apache.tuscany.core.component.scope;
import java.lang.reflect.Method;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.EagerInit;
import org.osoa.sca.annotations.Init;
import org.apache.tuscany.spi.QualifiedName;
@@ -57,8 +56,7 @@
Class<?>
targetClass,
ScopeContainer targetScopeContainer)
throws NoSuchMethodException {
- List<Class<?>> sourceInterfaces = new ArrayList<Class<?>>();
- sourceInterfaces.add(sourceClass);
+
Map<String, AtomicComponent> components = new HashMap<String,
AtomicComponent>();
AtomicComponent targetComponent = createAtomicComponent(target,
targetScopeContainer, targetClass);
PojoConfiguration sourceConfig = new PojoConfiguration();
@@ -68,17 +66,21 @@
//create target wire
Method[] sourceMethods = sourceClass.getMethods();
Class[] interfaces = targetClass.getInterfaces();
+ EagerInit eager = targetClass.getAnnotation(EagerInit.class);
+ if (eager != null) {
+ sourceConfig.setInitLevel(eager.value());
+ }
+
Method setter = null;
for (Class interfaze : interfaces) {
+
for (Method method : sourceMethods) {
if (method.getParameterTypes().length == 1) {
if
(interfaze.isAssignableFrom(method.getParameterTypes()[0])) {
setter = method;
}
}
- Init init;
- if ((init = method.getAnnotation(Init.class)) != null) {
- sourceConfig.setInitLevel(init.eager() ? 50 : 0);
+ if (method.getAnnotation(Init.class) != null) {
sourceConfig.setInitInvoker(new
MethodEventInvoker<Object>(method));
} else if (method.getAnnotation(Destroy.class) != null) {
@@ -115,13 +117,14 @@
PojoConfiguration configuration = new PojoConfiguration();
configuration.setScopeContainer(container);
configuration.setInstanceFactory(new
PojoObjectFactory(clazz.getConstructor()));
+ EagerInit eager = clazz.getAnnotation(EagerInit.class);
+ if (eager != null) {
+ configuration.setInitLevel(eager.value());
+ }
Method[] methods = clazz.getMethods();
for (Method method : methods) {
- Init init;
- if ((init = method.getAnnotation(Init.class)) != null) {
- configuration.setInitLevel(init.eager() ? 50 : 0);
+ if (method.getAnnotation(Init.class) != null) {
configuration.setInitInvoker(new
MethodEventInvoker<Object>(method));
-
} else if (method.getAnnotation(Destroy.class) != null) {
configuration.setDestroyInvoker(new
MethodEventInvoker<Object>(method));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
