You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/06 04:28:16 UTC
svn commit: r563007 - in /incubator/tuscany/java/sca/modules:
core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/
databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/
databinding/src/main/java/org/apache/tuscany...
Author: jsdelfino
Date: Sun Aug 5 19:28:15 2007
New Revision: 563007
URL: http://svn.apache.org/viewvc?view=rev&rev=563007
Log:
Work in progress, start to enable dynamic loading of databindings and transformers. Minor cleanup to remove hidden contracts (init and setRegistry) in the base databinding and transformer classes.
Added:
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java (with props)
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java (with props)
Modified:
incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
Modified: incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java (original)
+++ incubator/tuscany/java/sca/modules/core-databinding/src/main/java/org/apache/tuscany/sca/core/databinding/module/DataBindingModuleActivator.java Sun Aug 5 19:28:15 2007
@@ -30,8 +30,8 @@
import org.apache.tuscany.sca.databinding.DefaultDataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.DefaultTransformerExtensionPoint;
import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
-import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
import org.apache.tuscany.sca.databinding.impl.Group2GroupTransformer;
+import org.apache.tuscany.sca.databinding.impl.MediatorImpl;
import org.apache.tuscany.sca.databinding.javabeans.DOMNode2JavaBeanTransformer;
import org.apache.tuscany.sca.databinding.javabeans.JavaBean2DOMNodeTransformer;
import org.apache.tuscany.sca.databinding.javabeans.JavaBeansDataBinding;
@@ -104,20 +104,15 @@
}
DOMDataBinding domDataBinding = new DOMDataBinding();
- domDataBinding.setDataBindingRegistry(dataBindings);
dataBindings.addDataBinding(domDataBinding);
XMLStringDataBinding xmlStringDataBinding = new XMLStringDataBinding();
- xmlStringDataBinding.setDataBindingRegistry(dataBindings);
dataBindings.addDataBinding(xmlStringDataBinding);
XMLGroupDataBinding xmlGroupDataBinding = new XMLGroupDataBinding();
- xmlGroupDataBinding.setDataBindingRegistry(dataBindings);
dataBindings.addDataBinding(xmlGroupDataBinding);
JavaBeansDataBinding javaBeansDataBinding = new JavaBeansDataBinding();
- javaBeansDataBinding.setDataBindingRegistry(dataBindings);
dataBindings.addDataBinding(javaBeansDataBinding);
SimpleJavaDataBinding simpleJavaDataBinding = new SimpleJavaDataBinding();
- simpleJavaDataBinding.setDataBindingRegistry(dataBindings);
dataBindings.addDataBinding(simpleJavaDataBinding);
Group2GroupTransformer group2GroupTransformer = new Group2GroupTransformer();
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseDataBinding.java Sun Aug 5 19:28:15 2007
@@ -23,7 +23,6 @@
import java.lang.reflect.Type;
import org.apache.tuscany.sca.databinding.DataBinding;
-import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint;
import org.apache.tuscany.sca.databinding.ExceptionHandler;
import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
import org.apache.tuscany.sca.databinding.WrapperHandler;
@@ -37,12 +36,10 @@
*/
public abstract class BaseDataBinding implements DataBinding {
- protected DataBindingExtensionPoint registry;
+ private Class<?> baseType;
- protected Class<?> baseType;
-
- protected String name;
- protected String[] aliases;
+ private String name;
+ private String[] aliases;
/**
* Create a databinding with the base java type whose name will be used as
@@ -79,14 +76,6 @@
this.baseType = baseType;
this.aliases = aliases;
}
-
- public void setDataBindingRegistry(DataBindingExtensionPoint registry) {
- this.registry = registry;
- }
-
- public void init() {
- registry.addDataBinding(this);
- }
@SuppressWarnings("unchecked")
public boolean introspect(DataType type, Annotation[] annotations) {
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/BaseTransformer.java Sun Aug 5 19:28:15 2007
@@ -19,27 +19,17 @@
package org.apache.tuscany.sca.databinding.impl;
import org.apache.tuscany.sca.databinding.Transformer;
-import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
/**
- * Base Implementation of Transformer which provides the registration to the transformer registry
- *
+ * Base Implementation of Transformer which provides the registration to the
+ * transformer registry
+ *
* @version $Rev$ $Date$
*/
public abstract class BaseTransformer<S, T> implements Transformer {
- protected TransformerExtensionPoint registry;
-
protected BaseTransformer() {
super();
- }
-
- public void setTransformerRegistry(TransformerExtensionPoint registry) {
- this.registry = registry;
- }
-
- public void init() {
- registry.addTransformer(this);
}
protected abstract Class getSourceType();
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java?view=auto&rev=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java Sun Aug 5 19:28:15 2007
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.databinding.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+
+import org.apache.tuscany.sca.databinding.DataBinding;
+import org.apache.tuscany.sca.databinding.ExceptionHandler;
+import org.apache.tuscany.sca.databinding.SimpleTypeMapper;
+import org.apache.tuscany.sca.databinding.WrapperHandler;
+import org.apache.tuscany.sca.interfacedef.DataType;
+
+/**
+ * A data binding facade allowing data bindings to be lazily loaded and
+ * initialized.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LazyDataBinding implements DataBinding {
+
+ private String name;
+ private WeakReference<ClassLoader> classLoader;
+ private String className;
+ private DataBinding dataBinding;
+
+ public LazyDataBinding(String name, ClassLoader classLoader, String className) {
+ this.name = name;
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ this.className = className;
+ }
+
+ /**
+ * Load and instantiate the data binding class.
+ *
+ * @return The data binding.
+ */
+ @SuppressWarnings("unchecked")
+ private DataBinding getDataBinding() {
+ if (dataBinding == null) {
+ try {
+ Class<DataBinding> dataBindingClass =
+ (Class<DataBinding>)Class.forName(className, true, classLoader.get());
+ Constructor<DataBinding> constructor = dataBindingClass.getConstructor();
+ dataBinding = constructor.newInstance();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ return dataBinding;
+ }
+
+ public Object copy(Object object) {
+ return getDataBinding().copy(object);
+ }
+
+ public String[] getAliases() {
+ return null;
+ }
+
+ public ExceptionHandler getExceptionHandler() {
+ return getDataBinding().getExceptionHandler();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public SimpleTypeMapper getSimpleTypeMapper() {
+ return getDataBinding().getSimpleTypeMapper();
+ }
+
+ public WrapperHandler getWrapperHandler() {
+ return getDataBinding().getWrapperHandler();
+ }
+
+ public boolean introspect(DataType dataType, Annotation[] annotations) {
+ return getDataBinding().introspect(dataType, annotations);
+ }
+
+ public DataType introspect(Object value) {
+ return getDataBinding().introspect(value);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyDataBinding.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java?view=auto&rev=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java Sun Aug 5 19:28:15 2007
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.databinding.impl;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+
+/**
+ * A transformer facade allowing transformers to be lazily loaded
+ * and initialized.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LazyPullTransformer implements PullTransformer<Object, Object> {
+
+ private String source;
+ private String target;
+ private int weight;
+ private WeakReference<ClassLoader> classLoader;
+ private String className;
+ private PullTransformer<Object, Object> transformer;
+
+ public LazyPullTransformer(String source, String target, String weight, ClassLoader classLoader, String className) {
+ this.source = source;
+ this.target = target;
+ this.weight = Integer.valueOf(weight);
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ this.className = className;
+ }
+
+ /**
+ * Load and instantiate the transformer class.
+ *
+ * @return The transformer.
+ */
+ @SuppressWarnings("unchecked")
+ private PullTransformer<Object, Object> getTransformer() {
+ if (transformer == null) {
+ try {
+ Class<PullTransformer<Object, Object>> transformerClass =
+ (Class<PullTransformer<Object, Object>>)Class.forName(className, true, classLoader.get());
+ Constructor<PullTransformer<Object, Object>> constructor = transformerClass.getConstructor();
+ transformer = constructor.newInstance();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ return transformer;
+ }
+
+ public String getSourceDataBinding() {
+ return source;
+ }
+
+ public String getTargetDataBinding() {
+ return target;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public Object transform(Object source, TransformationContext context) {
+ return getTransformer().transform(source, context);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPullTransformer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java?view=auto&rev=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java (added)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java Sun Aug 5 19:28:15 2007
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.databinding.impl;
+
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+
+import org.apache.tuscany.sca.databinding.PushTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+
+/**
+ * A transformer facade allowing transformers to be lazily loaded
+ * and initialized.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LazyPushTransformer implements PushTransformer<Object, Object> {
+
+ private String source;
+ private String target;
+ private int weight;
+ private WeakReference<ClassLoader> classLoader;
+ private String className;
+ private PushTransformer<Object, Object> transformer;
+
+ public LazyPushTransformer(String source, String target, String weight, ClassLoader classLoader, String className) {
+ this.source = source;
+ this.target = target;
+ this.weight = Integer.valueOf(weight);
+ this.classLoader = new WeakReference<ClassLoader>(classLoader);
+ this.className = className;
+ }
+
+ /**
+ * Load and instantiate the transformer class.
+ *
+ * @return The transformer.
+ */
+ @SuppressWarnings("unchecked")
+ private PushTransformer<Object, Object> getTransformer() {
+ if (transformer == null) {
+ try {
+ Class<PushTransformer<Object, Object>> transformerClass =
+ (Class<PushTransformer<Object, Object>>)Class.forName(className, true, classLoader.get());
+ Constructor<PushTransformer<Object, Object>> constructor = transformerClass.getConstructor();
+ transformer = constructor.newInstance();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
+ }
+ return transformer;
+ }
+
+ public String getSourceDataBinding() {
+ return source;
+ }
+
+ public String getTargetDataBinding() {
+ return target;
+ }
+
+ public int getWeight() {
+ return weight;
+ }
+
+ public void transform(Object source, Object sink, TransformationContext context) {
+ getTransformer().transform(source, sink, context);
+ }
+
+}
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/impl/LazyPushTransformer.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/main/java/org/apache/tuscany/sca/databinding/xml/XMLStringDataBinding.java Sun Aug 5 19:28:15 2007
@@ -40,8 +40,8 @@
@Override
public boolean introspect(DataType type, Annotation[] annotations) {
- if (registry.getDataBinding(type.getDataBinding()) == this) {
- type.setDataBinding(getName());
+ if (NAME.equals(type.getDataBinding()) || ALIASES[0].equals(type.getDataBinding())) {
+ type.setDataBinding(NAME);
type.setLogical(XMLType.UNKNOWN);
return true;
} else {
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/DataBindingExtensionTestCase.java Sun Aug 5 19:28:15 2007
@@ -56,8 +56,6 @@
EasyMock.expect(registry.getDataBinding(Node.class.getName())).andReturn(binding1);
EasyMock.replay(registry);
- binding1.setDataBindingRegistry(registry);
- binding1.init();
assertNotNull(registry.getDataBinding(Node.class.getName()));
DataBinding1 binding2 = new DataBinding1("dom", Node.class);
Modified: incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java?view=diff&rev=563007&r1=563006&r2=563007
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/databinding/src/test/java/org/apache/tuscany/sca/databinding/extension/TransformerExtensionTestCase.java Sun Aug 5 19:28:15 2007
@@ -52,8 +52,7 @@
.expect(registry.getTransformer(transformer.getSourceDataBinding(), transformer.getTargetDataBinding()))
.andReturn(transformer);
EasyMock.replay(registry);
- transformer.setTransformerRegistry(registry);
- transformer.init();
+ registry.addTransformer(transformer);
assertSame(transformer, registry.getTransformer(transformer.getSourceDataBinding(), transformer
.getTargetDataBinding()));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org