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 2006/08/25 02:09:05 UTC
svn commit: r434578 - in
/incubator/tuscany/java/sca/databinding/databinding-framework/src:
main/java/org/apache/tuscany/databinding/
main/java/org/apache/tuscany/databinding/impl/
test/java/org/apache/tuscany/databinding/annotation/ test/java/org/apac...
Author: rfeng
Date: Thu Aug 24 17:09:04 2006
New Revision: 434578
URL: http://svn.apache.org/viewvc?rev=434578&view=rev
Log:
Add more comments and a new test case for the databinding-framework
Added:
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java (with props)
Modified:
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java
incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/annotation/DataBindingTestCase.java
Modified: incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java?rev=434578&r1=434577&r2=434578&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/TransformerRegistry.java Thu Aug 24 17:09:04 2006
@@ -26,39 +26,42 @@
*/
public interface TransformerRegistry {
/**
- * @param sourceType
- * @param resultType
+ * Register a transformer
+ * @param sourceDataBinding
+ * @param targetDataBinding
* @param weight
* @param transformer
*/
- public void registerTransformer(Object sourceType, Object resultType, int weight, Transformer transformer);
+ public void registerTransformer(String sourceDataBinding, String targetDataBinding, int weight, Transformer transformer);
/**
+ * Register a transformer
* @param transformer
*/
public void registerTransformer(Transformer transformer);
/**
- * @param sourceType
- * @param resultType
+ * Unregister a transformer
+ * @param sourceDataBinding
+ * @param targetDataBinding
* @return
*/
- public boolean unregisterTransformer(Object sourceType, Object resultType);
+ public boolean unregisterTransformer(String sourceDataBinding, String targetDataBinding);
/**
* Get the direct Transformer which can transform data from source type to result type
*
- * @param sourceType
- * @param resultType
+ * @param sourceDataBinding
+ * @param targetDataBinding
* @return
*/
- public Transformer getTransformer(Object sourceType, Object resultType);
+ public Transformer getTransformer(String sourceDataBinding, String targetDataBinding);
/**
* Get the a chain of Transformers which can transform data from source type to result type
- * @param sourceType
- * @param resultType
+ * @param sourceDataBinding
+ * @param targetDataBinding
* @return
*/
- public List<Transformer> getTransformerChain(Object sourceType, Object resultType);
+ public List<Transformer> getTransformerChain(String sourceDataBinding, String targetDataBinding);
}
Modified: incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java?rev=434578&r1=434577&r2=434578&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/MediatorImpl.java Thu Aug 24 17:09:04 2006
@@ -26,6 +26,7 @@
import org.apache.tuscany.databinding.PullTransformer;
import org.apache.tuscany.databinding.PushTransformer;
import org.apache.tuscany.databinding.TransformationContext;
+import org.apache.tuscany.databinding.TransformationException;
import org.apache.tuscany.databinding.Transformer;
import org.apache.tuscany.databinding.TransformerRegistry;
import org.apache.tuscany.spi.annotation.Autowire;
@@ -46,14 +47,13 @@
}
/**
- * @see org.apache.tuscany.databinding.Mediator#mediate(java.lang.Object, org.apache.tuscany.spi.model.DataType, org.apache.tuscany.spi.model.DataType)
+ * @see org.apache.tuscany.databinding.Mediator#mediate(java.lang.Object, org.apache.tuscany.spi.model.DataType,
+ * org.apache.tuscany.spi.model.DataType)
*/
@SuppressWarnings("unchecked")
public Object mediate(Object source, DataType sourceDataType, DataType targetDataType) {
- String sourceId = sourceDataType.getDataBinding();
- String targetId = targetDataType.getDataBinding();
- List<Transformer> path = transformerRegistry.getTransformerChain(sourceId, targetId);
-
+ List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
+
Object result = source;
for (Iterator<Transformer> i = path.iterator(); i.hasNext();) {
Transformer transformer = i.next();
@@ -77,9 +77,7 @@
@SuppressWarnings("unchecked")
public void mediate(Object source, Object target, DataType sourceDataType, DataType targetDataType) {
- String sourceId = sourceDataType.getDataBinding();
- String targetId = targetDataType.getDataBinding();
- List<Transformer> path = transformerRegistry.getTransformerChain(sourceId, targetId);
+ List<Transformer> path = getTransformerChain(sourceDataType, targetDataType);
Object result = source;
for (Iterator<Transformer> i = path.iterator(); i.hasNext();) {
@@ -97,6 +95,19 @@
result = (dataPipe != null) ? dataPipe.getResult() : null;
}
}
+ }
+
+ private List<Transformer> getTransformerChain(DataType sourceDataType, DataType targetDataType) {
+ String sourceId = sourceDataType.getDataBinding();
+ String targetId = targetDataType.getDataBinding();
+ List<Transformer> path = transformerRegistry.getTransformerChain(sourceId, targetId);
+ if (path == null) {
+ TransformationException ex = new TransformationException("No path found for the transformation");
+ ex.addContextName("Source: " + sourceId);
+ ex.addContextName("Target: " + targetId);
+ throw ex;
+ }
+ return path;
}
}
Modified: incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java?rev=434578&r1=434577&r2=434578&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/src/main/java/org/apache/tuscany/databinding/impl/TransformerRegistryImpl.java Thu Aug 24 17:09:04 2006
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.tuscany.databinding.TransformationException;
import org.apache.tuscany.databinding.Transformer;
import org.apache.tuscany.databinding.TransformerRegistry;
import org.apache.tuscany.databinding.util.DirectedGraph;
@@ -35,7 +34,7 @@
public void init() {
}
- public void registerTransformer(Object sourceType, Object resultType, int weight, Transformer transformer) {
+ public void registerTransformer(String sourceType, String resultType, int weight, Transformer transformer) {
graph.addEdge(sourceType, resultType, transformer, weight);
}
@@ -43,23 +42,20 @@
graph.addEdge(transformer.getSourceBinding(), transformer.getTargetBinding(), transformer, transformer.getWeight());
}
- public boolean unregisterTransformer(Object sourceType, Object resultType) {
+ public boolean unregisterTransformer(String sourceType, String resultType) {
return graph.removeEdge(sourceType, resultType);
}
- public Transformer getTransformer(Object sourceType, Object resultType) {
+ public Transformer getTransformer(String sourceType, String resultType) {
DirectedGraph<Object, Transformer>.Edge edge = graph.getEdge(sourceType, resultType);
return (edge == null) ? null : edge.getValue();
}
- public List<Transformer> getTransformerChain(Object sourceType, Object resultType) {
+ public List<Transformer> getTransformerChain(String sourceType, String resultType) {
List<Transformer> transformers = new ArrayList<Transformer>();
DirectedGraph<Object, Transformer>.Path path = graph.getShortestPath(sourceType, resultType);
if (path == null) {
- TransformationException ex = new TransformationException("No path found for the transformation");
- ex.addContextName("Source: " + sourceType.toString());
- ex.addContextName("Target: " + resultType.toString());
- throw ex;
+ return null;
}
for (DirectedGraph<Object, Transformer>.Edge edge : path.getEdges()) {
transformers.add(edge.getValue());
Modified: incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/annotation/DataBindingTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/annotation/DataBindingTestCase.java?rev=434578&r1=434577&r2=434578&view=diff
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/annotation/DataBindingTestCase.java (original)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/annotation/DataBindingTestCase.java Thu Aug 24 17:09:04 2006
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.databinding.annotation;
-import java.lang.reflect.Field;
import java.lang.reflect.Method;
import junit.framework.Assert;
Added: incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java?rev=434578&view=auto
==============================================================================
--- incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java (added)
+++ incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java Thu Aug 24 17:09:04 2006
@@ -0,0 +1,120 @@
+/*
+ * 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.databinding.impl;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+import java.util.List;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.databinding.Transformer;
+import org.apache.tuscany.databinding.TransformerRegistry;
+
+/**
+ *
+ */
+public class TransformerRegistryImplTestCase extends TestCase {
+ private TransformerRegistry registry;
+
+ /**
+ * @see junit.framework.TestCase#setUp()
+ */
+ protected void setUp() throws Exception {
+ super.setUp();
+ registry = new TransformerRegistryImpl();
+ }
+
+ /**
+ * Test method for
+ * {@link org.apache.tuscany.databinding.impl.TransformerRegistryImpl#registerTransformer(java.lang.String, java.lang.String, int, org.apache.tuscany.databinding.Transformer)}.
+ */
+ public void testRegisterTransformer1() {
+ Transformer transformer = createMock(Transformer.class);
+ registry.registerTransformer("a", "b", 10, transformer);
+ Transformer t = registry.getTransformer("a", "b");
+ Assert.assertSame(t, transformer);
+ }
+
+ /**
+ * Test method for
+ * {@link org.apache.tuscany.databinding.impl.TransformerRegistryImpl#registerTransformer(org.apache.tuscany.databinding.Transformer)}.
+ */
+ public void testRegisterTransformerTransformer() {
+ Transformer transformer = createMock(Transformer.class);
+ expect(transformer.getSourceBinding()).andReturn("a");
+ expect(transformer.getTargetBinding()).andReturn("b");
+ expect(transformer.getWeight()).andReturn(10);
+ replay(transformer);
+ registry.registerTransformer(transformer);
+ Transformer t = registry.getTransformer("a", "b");
+ Assert.assertSame(t, transformer);
+ }
+
+ /**
+ * Test method for {@link org.apache.tuscany.databinding.impl.TransformerRegistryImpl#unregisterTransformer(java.lang.String, java.lang.String)}.
+ */
+ public void testUnregisterTransformer() {
+ Transformer transformer = createMock(Transformer.class);
+ registry.registerTransformer("a", "b", 10, transformer);
+ boolean result = registry.unregisterTransformer("a", "b");
+ Assert.assertTrue(result);
+ Transformer t = registry.getTransformer("a", "b");
+ Assert.assertNull(t);
+ }
+
+ /**
+ * Test method for {@link org.apache.tuscany.databinding.impl.TransformerRegistryImpl#getTransformerChain(java.lang.String, java.lang.String)}.
+ */
+ public void testGetTransformerChain() {
+ Transformer t1 = createMock(Transformer.class);
+ expect(t1.getSourceBinding()).andReturn("a");
+ expect(t1.getTargetBinding()).andReturn("b");
+ expect(t1.getWeight()).andReturn(10);
+ replay(t1);
+ Transformer t2 = createMock(Transformer.class);
+ expect(t2.getSourceBinding()).andReturn("b");
+ expect(t2.getTargetBinding()).andReturn("c");
+ expect(t2.getWeight()).andReturn(20);
+ replay(t2);
+
+ Transformer t3 = createMock(Transformer.class);
+ expect(t3.getSourceBinding()).andReturn("a");
+ expect(t3.getTargetBinding()).andReturn("c");
+ expect(t3.getWeight()).andReturn(120);
+ replay(t3);
+
+ registry.registerTransformer(t1);
+ registry.registerTransformer(t2);
+ registry.registerTransformer(t3);
+
+ List<Transformer> l1 = registry.getTransformerChain("a", "b");
+ Assert.assertTrue(l1.size() == 1 && l1.get(0) == t1);
+ List<Transformer> l2 = registry.getTransformerChain("a", "c");
+ Assert.assertTrue(l2.size() == 2 && l2.get(0) == t1 && l2.get(1) == t2);
+ List<Transformer> l3 = registry.getTransformerChain("a", "d");
+ Assert.assertNull(l3);
+
+ }
+
+}
Propchange: incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/databinding/databinding-framework/src/test/java/org/apache/tuscany/databinding/impl/TransformerRegistryImplTestCase.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org