You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ke...@apache.org on 2007/07/19 15:33:34 UTC
svn commit: r557615 [1/2] - in
/incubator/tuscany/branches/sdo-1.0-incubating:
impl/src/main/java/org/apache/tuscany/sdo/helper/
impl/src/main/java/org/apache/tuscany/sdo/util/
impl/src/test/java/org/apache/tuscany/sdo/test/
lib/src/main/java/org/apach...
Author: kelvingoodson
Date: Thu Jul 19 06:33:32 2007
New Revision: 557615
URL: http://svn.apache.org/viewvc?view=rev&rev=557615
Log:
applying TUSCANY-1429 patch, but I decided to alter the api rather than deprecate it since it has never been exposed in a release, so it would be a shame to publish a brand new API with deprecations in it. When the commit is ported to the trunk, then the half a dozen references that are made to the old style of the API from within SCA will need to be fixed.
Modified:
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
incubator/tuscany/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
incubator/tuscany/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
incubator/tuscany/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/HelperProviderBase.java
incubator/tuscany/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java Thu Jul 19 06:33:32 2007
@@ -52,8 +52,8 @@
protected XMLHelper xmlHelper;
protected XSDHelper xsdHelper;
protected XMLStreamHelper xmlStreamHelper;
- protected Map defaultOptions;
-
+ protected Map defaultOptions = null;
+
public HelperContextImpl(ExtendedMetaData extendedMetaData, boolean extensibleNamespaces) {
this.defaultOptions = null;
this.extendedMetaData = extendedMetaData;
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java Thu Jul 19 06:33:32 2007
@@ -23,19 +23,20 @@
import org.apache.tuscany.sdo.spi.HelperProviderBase;
import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
/**
* Create and manage all the default helper INSTANCEs
*/
public class HelperProviderImpl extends HelperProviderBase
-{
- public void createDefaultHelpers()
+{
+ public HelperContext createDefaultHelpers()
{
//FB HelperContext hc = SDOUtil.createHelperContext();
//FB The defulat HelperContext must use EMF's ClassLoader-delegating EPackage.Registry.INSTANCE, until we provide
//FB another way to get (ClassLoader scope) support for HelperContext.
- HelperContext hc = new HelperContextImpl(new SDOExtendedMetaDataImpl(), false);
+ HelperContext hc = new HelperContextImpl(new SDOExtendedMetaDataImpl(), false);
typeHelper = hc.getTypeHelper();
dataFactory = hc.getDataFactory();
xmlHelper = hc.getXMLHelper();
@@ -45,5 +46,7 @@
dataHelper = new DataHelperImpl();
sdoHelper = new SDOHelperImpl();
xmlStreamHelper = ((HelperContextImpl)hc).getXMLStreamHelper();
+
+ return hc;
}
}
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java Thu Jul 19 06:33:32 2007
@@ -66,6 +66,7 @@
import org.eclipse.emf.ecore.util.FeatureMapUtil;
import org.eclipse.emf.ecore.xmi.XMLResource;
+import commonj.sdo.impl.HelperProvider;
import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -146,31 +147,36 @@
options.put(LOADING_SCOPE, extendedMetaData);
}
- public DataGraph loadDataGraph(InputStream inputStream, Map options, TypeHelper scope) throws IOException {
- DataGraph result = null;
- if (scope == null || scope == TypeHelper.INSTANCE) {
- result = loadDataGraph(inputStream, options);
- } else if (options == null) {
- options = new HashMap();
- registerLoadingScope(options, scope);
- result = loadDataGraph(inputStream, options);
- } else if (options.containsKey(LOADING_SCOPE)) {
- Object restore = options.get(LOADING_SCOPE);
- registerLoadingScope(options, scope);
- try {
- result = loadDataGraph(inputStream, options);
- } finally {
- options.put(LOADING_SCOPE, restore);
- }
- } else {
- registerLoadingScope(options, scope);
- try {
- result = loadDataGraph(inputStream, options);
- } finally {
- options.remove(LOADING_SCOPE);
- }
+
+ public DataGraph loadDataGraph(InputStream inputStream, Map options, HelperContext scope) throws IOException {
+ if (scope == null) {
+ scope = HelperProvider.getDefaultContext();
}
- return result;
+ TypeHelper th = scope.getTypeHelper();
+ DataGraph result = null;
+ if (th == null || th == TypeHelper.INSTANCE) {
+ result = loadDataGraph(inputStream, options);
+ } else if (options == null) {
+ options = new HashMap();
+ registerLoadingScope(options, th);
+ result = loadDataGraph(inputStream, options);
+ } else if (options.containsKey(LOADING_SCOPE)) {
+ Object restore = options.get(LOADING_SCOPE);
+ registerLoadingScope(options, th);
+ try {
+ result = loadDataGraph(inputStream, options);
+ } finally {
+ options.put(LOADING_SCOPE, restore);
+ }
+ } else {
+ registerLoadingScope(options, th);
+ try {
+ result = loadDataGraph(inputStream, options);
+ } finally {
+ options.remove(LOADING_SCOPE);
+ }
+ }
+ return result;
}
public void saveDataGraph(DataGraph dataGraph, OutputStream outputStream, Map options) throws IOException {
@@ -201,32 +207,36 @@
}
}
+ public HelperContext createHelperContext() {
+ return new HelperContextImpl(false, null);
+ }
+
public HelperContext createHelperContext(boolean extensibleNamespaces) {
return new HelperContextImpl(extensibleNamespaces);
}
+
+ public HelperContext createHelperContext(Map options) {
+ return new HelperContextImpl(false, options);
+ }
public HelperContext createHelperContext(boolean extensibleNamespaces, Map options) {
return new HelperContextImpl(extensibleNamespaces, options);
}
- public CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope) {
- return new CrossScopeCopyHelperImpl(targetScope);
- }
-
- public XMLStreamHelper createXMLStreamHelper(TypeHelper scope) {
- return (new HelperContextImpl(scope)).getXMLStreamHelper();
+ public CopyHelper createCrossScopeCopyHelper(HelperContext hc) {
+ return new CrossScopeCopyHelperImpl(hc.getTypeHelper());
}
-
- public XMLStreamHelper createXMLStreamHelper(TypeHelper scope, Map options) {
- HelperContext helperContextImpl = new HelperContextImpl(scope, options);
- return ((HelperContextImpl)helperContextImpl).getXMLStreamHelper();
+
+ public XMLStreamHelper createXMLStreamHelper(HelperContext hc) {
+ return ((HelperContextImpl)hc).getXMLStreamHelper();
}
- public List getTypes(TypeHelper scope, String uri) {
+
+ public List getTypes(HelperContext hc, String uri) {
- EPackage ePackage = ((TypeHelperImpl)scope).getExtendedMetaData().getPackage(uri);
+ EPackage ePackage = ((HelperContextImpl)hc).getExtendedMetaData().getPackage(uri);
if (ePackage != null) {
return new ArrayList(ePackage.getEClassifiers());
}
@@ -243,8 +253,10 @@
return "".equals(SDOExtendedMetaData.INSTANCE.getName((EClassifier)type));
}
- public Type createType(TypeHelper scope, String uri, String name, boolean isDataType) {
- ExtendedMetaData extendedMetaData = ((TypeHelperImpl)scope).getExtendedMetaData();
+
+
+ public Type createType(HelperContext hc, String uri, String name, boolean isDataType) {
+ ExtendedMetaData extendedMetaData = ((HelperContextImpl)hc).getExtendedMetaData();
if ("".equals(uri))
uri = null; // FB
@@ -395,15 +407,16 @@
}
}
- public Property createOpenContentProperty(TypeHelper scope, String uri, String name, Type type)
+
+ public Property createOpenContentProperty(HelperContext hc, String uri, String name, Type type)
{
- ExtendedMetaData extendedMetaData = ((TypeHelperImpl)scope).getExtendedMetaData();
+ ExtendedMetaData extendedMetaData = ((HelperContextImpl)hc).getExtendedMetaData();
// get/create document root
EPackage ePackage = extendedMetaData.getPackage(uri);
Type documentRoot = ePackage != null ? (Type)extendedMetaData.getType(ePackage, "") : null;
if (documentRoot == null) {
- documentRoot = createType(scope, uri, null, false);
+ documentRoot = createType(hc, uri, null, false);
}
// Determine if property already exists
@@ -418,6 +431,7 @@
}
return newProperty;
}
+
public void addAliasName(Property property, String aliasName) {
throw new UnsupportedOperationException(); // TODO: implement this
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java Thu Jul 19 06:33:32 2007
@@ -174,7 +174,7 @@
org.apache.tuscany.sdo.model.Type modeledType = (org.apache.tuscany.sdo.model.Type)type;
boolean isDataType = modeledType.isDataType();
- Type definedType = SDOUtil.createType(this, modeledType.getUri(), modeledType.getName(), isDataType);
+ Type definedType = SDOUtil.createType(helperContext, modeledType.getUri(), modeledType.getName(), isDataType);
if (definedType == null) {
// If type already defined, return existing Type.
return getType(modeledType.getUri(), modeledType.getName());
@@ -214,7 +214,7 @@
propertyName = propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
}
Property globalProperty =
- SDOUtil.createOpenContentProperty(this, definedType.getURI(), propertyName, definedType);
+ SDOUtil.createOpenContentProperty(helperContext, definedType.getURI(), propertyName, definedType);
SDOUtil.setContainment(globalProperty, true);
}
} // if (!isDataType)
@@ -323,7 +323,7 @@
if (uri == null)
uri = TUSCANY_NO_URI;
- Property newProperty = SDOUtil.createOpenContentProperty(this, uri, modeledProperty.getName(), propertyType);
+ Property newProperty = SDOUtil.createOpenContentProperty(helperContext, uri, modeledProperty.getName(), propertyType);
// Propagate the modeled property's attributes
initializeProperty(newProperty, modeledProperty);
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java Thu Jul 19 06:33:32 2007
@@ -81,6 +81,7 @@
import commonj.sdo.Sequence;
import commonj.sdo.Type;
import commonj.sdo.helper.DataHelper;
+import commonj.sdo.helper.HelperContext;
import commonj.sdo.helper.TypeHelper;
import commonj.sdo.impl.HelperProvider;
@@ -1834,7 +1835,7 @@
propertyType = ((ModelFactoryImpl)ModelFactory.INSTANCE).getObject();
}
- Property newProperty = SDOUtil.createOpenContentProperty(TypeHelper.INSTANCE, uri, name, propertyType);
+ Property newProperty = SDOUtil.createOpenContentProperty(HelperProvider.getDefaultContext(), uri, name, propertyType);
if (isMany)
SDOUtil.setMany(newProperty, isMany);
if (isContainment)
@@ -2797,7 +2798,8 @@
public static List getMetaObjectInstanceProperties(EModelElement metaObject)
{
// Use the default helper context for now
- TypeHelper typeHelper = HelperProvider.getDefaultContext().getTypeHelper();
+// TypeHelper typeHelper = HelperProvider.getDefaultContext().getTypeHelper();
+ HelperContext hc = HelperProvider.getDefaultContext();
List result = new UniqueEList();
List annotations = metaObject.getEAnnotations();
@@ -2812,7 +2814,7 @@
EStringToStringMapEntryImpl entry = (EStringToStringMapEntryImpl)iter.next();
String propertyName = entry.getTypedKey();
- Property globalProperty = getGlobalProperty(typeHelper, propertyURI, propertyName);
+ Property globalProperty = getGlobalProperty(hc, propertyURI, propertyName);
if (globalProperty != null)
{
result.add(globalProperty);
@@ -2835,7 +2837,7 @@
//TODO if (property.isMany()) ... // create list of values from from string
return SDOUtil.createFromString(property.getType(), value);
}
-
+/*
protected static Property getGlobalProperty(TypeHelper typeHelper, String uri, String name)
{
Property property;
@@ -2874,5 +2876,43 @@
}
return property;
}
-
+*/
+ protected static Property getGlobalProperty(HelperContext hc, String uri, String name)
+ {
+ Property property;
+ if (ExtendedMetaData.ANNOTATION_URI.equals(uri)) {
+ if ("minExclusive".equals(name) ||
+ "minInclusive".equals(name) ||
+ "maxExclusive".equals(name) ||
+ "maxInclusive".equals(name) ||
+ "totalDigits".equals(name) ||
+ "fractionDigits".equals(name) ||
+ "length".equals(name) ||
+ "minLength".equals(name) ||
+ "maxLength".equals(name) ||
+ "enumeration".equals(name) ||
+ "whiteSpace".equals(name) ||
+ "pattern".equals(name))
+ {
+ //TODO Use standard facet properties, once SDO defines them
+ //TODO property = getSDOFacetProperty(name);
+ //TEMP For now just expose a string property for the EMF (ExtendedMetaData) facets
+ property = SDOUtil.createOpenContentProperty(hc, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
+ }
+ else
+ {
+ //TODO Should we consider exposing more ExtendedMetaData?
+ property = null;
+ }
+ }
+ else
+ {
+ property = hc.getTypeHelper().getOpenContentProperty(uri, name);
+ if (property == null)
+ {
+ property = SDOUtil.createOpenContentProperty(hc, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
+ }
+ }
+ return property;
+ }
}
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java Thu Jul 19 06:33:32 2007
@@ -32,13 +32,10 @@
import java.util.Map;
import org.apache.tuscany.sdo.api.SDOHelper.XMLOptions;
-import org.apache.tuscany.sdo.helper.DataFactoryImpl;
import org.apache.tuscany.sdo.helper.HelperContextImpl;
import org.apache.tuscany.sdo.helper.SDOExtendedMetaDataImpl;
import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.helper.XMLHelperImpl;
import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
@@ -116,7 +113,7 @@
* Create a new DataFactory, with visibility to types in the specified TypeHelper scope.
* @param scope the TypeHelper to use for locating types.
* @return the new DataFactory.
- * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
+ * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createDataFactory(HelperContext)}
*/
public static DataFactory createDataFactory(TypeHelper scope)
{
@@ -127,7 +124,7 @@
* Create a new XMLHelper, with visibility to types in the specified TypeHelper scope.
* @param scope the TypeHelper to use for locating types.
* @return the new XMLHelper.
- * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
+ * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createXMLHelper(HelperContext)}
*/
public static XMLHelper createXMLHelper(TypeHelper scope)
{
@@ -339,21 +336,21 @@
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, TypeHelper)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, HelperContext)}.
* @deprecated
*/
public static DataGraph loadDataGraph(InputStream inputStream, Map options) throws IOException
{
- return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, null);
+ return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, (HelperContext)null);
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, TypeHelper)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, HelperContext)}.
* @deprecated
*/
public static DataGraph loadDataGraph(InputStream inputStream, Map options, TypeHelper scope) throws IOException
{
- return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, scope);
+ return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, ((TypeHelperImpl)scope).getHelperContext());
}
/**
@@ -393,21 +390,21 @@
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createCrossScopeCopyHelper(TypeHelper)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createCrossScopeCopyHelper(HelperContext)}.
* @deprecated
*/
public static CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope)
{
- return org.apache.tuscany.sdo.api.SDOUtil.createCrossScopeCopyHelper(targetScope);
+ return org.apache.tuscany.sdo.api.SDOUtil.createCrossScopeCopyHelper(((TypeHelperImpl)targetScope).getHelperContext());
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createXMLStreamHelper(TypeHelper)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createXMLStreamHelper(HelperContext)}.
* @deprecated
*/
public static XMLStreamHelper createXMLStreamHelper(TypeHelper scope)
{
- return (XMLStreamHelper)org.apache.tuscany.sdo.api.SDOUtil.createXMLStreamHelper(scope);
+ return (XMLStreamHelper)org.apache.tuscany.sdo.api.SDOUtil.createXMLStreamHelper(((TypeHelperImpl)scope).getHelperContext());
}
/**
@@ -429,12 +426,12 @@
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getTypes(TypeHelper, String)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getTypes(HelperContext, String)}.
* @deprecated
*/
public static List getTypes(TypeHelper scope, String uri) {
- return org.apache.tuscany.sdo.api.SDOUtil.getTypes(scope, uri);
+ return org.apache.tuscany.sdo.api.SDOUtil.getTypes(((TypeHelperImpl)scope).getHelperContext(), uri);
}
/**
@@ -456,12 +453,12 @@
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createType(TypeHelper, String, String, boolean)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createType(HelperContext, String, String, boolean)}.
* @deprecated
*/
public static Type createType(TypeHelper scope, String uri, String name, boolean isDataType)
{
- return org.apache.tuscany.sdo.api.SDOUtil.createType(scope, uri, name, isDataType);
+ return org.apache.tuscany.sdo.api.SDOUtil.createType(((TypeHelperImpl)scope).getHelperContext(), uri, name, isDataType);
}
/**
@@ -528,12 +525,12 @@
}
/**
- * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createGlobalProperty(TypeHelper, String, String, Type)}.
+ * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createGlobalProperty(HelperContext, String, String, Type)}.
* @deprecated
*/
public static Property createGlobalProperty(TypeHelper scope, String uri, String name, Type type)
{
- return org.apache.tuscany.sdo.api.SDOUtil.createOpenContentProperty(scope, uri, name, type);
+ return org.apache.tuscany.sdo.api.SDOUtil.createOpenContentProperty(((TypeHelperImpl)scope).getHelperContext(), uri, name, type);
}
/**
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java Thu Jul 19 06:33:32 2007
@@ -31,8 +31,8 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.XMLStreamHelper;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -53,8 +53,8 @@
private static final String TEST_NAMESPACE = "http://www.example.com/anytype";
public void testAnySimpleType() throws Exception {
- Property property = typeHelper.getOpenContentProperty(TEST_NAMESPACE, "globalElement");
- Type propertyType = property.getType();
+ final Property property = typeHelper.getOpenContentProperty(TEST_NAMESPACE, "globalElement");
+ final Type propertyType = property.getType();
DataObject dataObject = dataFactory.create(TEST_NAMESPACE, "Person");
dataObject.set("firstName", "Fuhwei");
@@ -67,17 +67,17 @@
rootObject.set("personElement", dataObject);
// XMLStreamHelper.saveObject has a problem to serialize the any type
- XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- StringWriter writer = new StringWriter();
- XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+ final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+ final StringWriter writer = new StringWriter();
+ final XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
streamHelper.saveObject(rootObject, streamWriter);
streamWriter.flush();
// System.out.println(writer.toString());
- XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- StringReader reader = new StringReader(writer.toString());
- XMLStreamReader streamReader = inputFactory.createXMLStreamReader(reader);
- XMLDocument doc = streamHelper.load(streamReader);
+ final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+ final StringReader reader = new StringReader(writer.toString());
+ final XMLStreamReader streamReader = inputFactory.createXMLStreamReader(reader);
+ final XMLDocument doc = streamHelper.load(streamReader);
rootObject = doc.getRootObject();
DataObject testObject = rootObject.getDataObject("anyTypeElement");
// System.out.println("anyTypeElement dataobject: " + testObject);
@@ -87,24 +87,24 @@
public void testAbstractTypeFails() {
try {
- DataObject abstractObj = dataFactory.create("commonj.sdo","DataObject");
+ final DataObject abstractObj = dataFactory.create("commonj.sdo","DataObject");
assertTrue("Should not succeed", false);
}
- catch ( IllegalArgumentException e) {
+ catch ( final IllegalArgumentException e) {
// expected result
}
}
protected void setUp() throws Exception {
- HelperContext hc = SDOUtil.createHelperContext();
+ final HelperContext hc = SDOUtil.createHelperContext();
typeHelper = hc.getTypeHelper();
dataFactory = hc.getDataFactory();
xsdHelper = hc.getXSDHelper();
- streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
+ streamHelper = SDOUtil.createXMLStreamHelper(hc);
// Populate the meta data for the test (Stock Quote) model
- URL url = getClass().getResource(TEST_MODEL);
- InputStream inputStream = url.openStream();
+ final URL url = getClass().getResource(TEST_MODEL);
+ final InputStream inputStream = url.openStream();
xsdHelper.define(inputStream, url.toString());
inputStream.close();
}
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java Thu Jul 19 06:33:32 2007
@@ -29,7 +29,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.ChangeSummary;
import commonj.sdo.DataGraph;
@@ -53,7 +53,7 @@
Type cst = th.getType("commonj.sdo","ChangeSummaryType");
Type strt = th.getType("commonj.sdo", "String");
- Type newt = SDOUtil.createType(th, "testcases.changesummary", "simpleCS", false);
+ Type newt = SDOUtil.createType(hc, "testcases.changesummary", "simpleCS", false);
Property strProp = SDOUtil.createProperty(newt, "strElem", strt);
SDOUtil.createProperty(newt, "changeSummary", cst);
@@ -67,7 +67,7 @@
Type strt = th.getType("commonj.sdo", "String");
- Type newt = SDOUtil.createType(th, "testcases.changesummary", "simpleNOCS", false);
+ Type newt = SDOUtil.createType(hc, "testcases.changesummary", "simpleNOCS", false);
Property strProp = SDOUtil.createProperty(newt, "strElem", strt);
DataGraph graph = SDOUtil.createDataGraph();
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java Thu Jul 19 06:33:32 2007
@@ -21,8 +21,9 @@
import commonj.sdo.Sequence;
import commonj.sdo.Type;
import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.util.SDOUtil;
+
+import org.apache.tuscany.sdo.api.XMLStreamHelper;
+import org.apache.tuscany.sdo.api.SDOUtil;
import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamException;
@@ -66,7 +67,7 @@
// the StackOverflowException to occur. The catcher is catching RuntimeException, so it does
// not matter which Exception is thrown by the SDO code.
public void atestStaticOneMemberSingleValueSetDataObject() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
@@ -79,9 +80,9 @@
* and verify the behavior of serialization. This is the static version of this test case.
*/
public void atestStaticNMemberSingleValueSetDataObject() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -97,9 +98,9 @@
* and verify the behavior of serialization. This is the static version of this test case.
*/
public void atestStaticOneMemberMultiValueSetDataObject() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -114,9 +115,9 @@
* and verify the behavior of serialization. This is the static version of this test case.
*/
public void atestStaticNMemberMultiValueSetDataObject() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -132,7 +133,7 @@
* of this test case.
*/
public void atestStaticOneMemberReturnedList() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
@@ -146,9 +147,9 @@
* of this test case.
*/
public void atestStaticNMemberReturnedList() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -164,7 +165,7 @@
* serialization. This is the static version of this test case.
*/
public void atestStaticOneMemberSingleValueSequence() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
@@ -178,9 +179,9 @@
* serialization. This is the static version of this test case.
*/
public void atestStaticNMemberSingleValueSequence() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -196,9 +197,9 @@
* serialization. This is the static version of this test case.
*/
public void atestStaticOneMemberMultiValueSequence() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -214,9 +215,9 @@
* serialization. This is the static version of this test case.
*/
public void atestStaticNMemberMultiValueSequence() {
- DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
- DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj1 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj2 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
+ final DataObject dataObj3 = (DataObject) ContainmentFactory.INSTANCE.createContainmentTest();
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -233,7 +234,7 @@
public void testHybridOneMemberSingleValueSetDataObject() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
@@ -248,11 +249,11 @@
public void testHybridNMemberSingleValueSetDataObject() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -269,11 +270,11 @@
public void testHybridOneMemberMultiValueSetDataObject() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
@@ -291,11 +292,11 @@
public void testHybridNMemberMultiValueSetDataObject() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -313,7 +314,7 @@
public void testHybridOneMemberReturnedList() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
@@ -329,11 +330,11 @@
public void testHybridNMemberReturnedList() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -351,7 +352,7 @@
public void testHybridOneMemberSingleValueSequence() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
@@ -367,11 +368,11 @@
public void testHybridNMemberSingleValueSequence() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
@@ -389,9 +390,9 @@
public void testHybridOneMemberMultiValueSequence() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -408,9 +409,9 @@
public void testHybridNMemberMultiValueSequence() {
assertTrue("Test case cannot proceed due to error creating Type.", mixedCreated);
- DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = mixedScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -424,7 +425,7 @@
* and verify the behavior of serialization. This is the dynamic version of this test case.
*/
public void testDynamicOneMemberSingleValueSetDataObject() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI,
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI,
CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
@@ -437,9 +438,9 @@
* and verify the behavior of serialization. This is the dynamic version of this test case.
*/
public void testDynamicNMemberSingleValueSetDataObject() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -453,9 +454,9 @@
* and verify the behavior of serialization. This is the dynamic version of this test case.
*/
public void testDynamicOneMemberMultiValueSetDataObject() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -469,9 +470,9 @@
* and verify the behavior of serialization. This is the dynamic version of this test case.
*/
public void testDynamicNMemberMultiValueSetDataObject() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -486,7 +487,7 @@
* of this test case.
*/
public void testDynamicOneMemberReturnedList() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
returnedListOneMember(dataObj1);
@@ -499,9 +500,9 @@
* of this test case.
*/
public void testDynamicNMemberReturnedList() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -516,7 +517,7 @@
* serialization. This is the dynamic version of this test case.
*/
public void testDynamicOneMemberSingleValueSequence() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
sequenceSingleValueOneMember(dataObj1);
@@ -529,9 +530,9 @@
* serialization. This is the dynamic version of this test case.
*/
public void testDynamicNMemberSingleValueSequence() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -546,9 +547,9 @@
* serialization. This is the dynamic version of this test case.
*/
public void testDynamicOneMemberMultiValueSequence() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -563,9 +564,9 @@
* serialization. This is the dynamic version of this test case.
*/
public void testDynamicNMemberMultiValueSequence() {
- DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
- DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj1 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj2 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
+ final DataObject dataObj3 = dynamicScope.getDataFactory().create(CONTAIN_URI, CONTAIN_TYPE);
dataObj1.setString("Name", "dataObj1");
dataObj2.setString("Name", "dataObj2");
dataObj3.setString("Name", "dataObj3");
@@ -579,14 +580,14 @@
* and Java serialization.
* @param dataObj
*/
- private void attemptSerialization(DataObject dataObj, HelperContext scope) {
+ private void attemptSerialization(final DataObject dataObj, final HelperContext scope) {
assertTrue("Containment cycle was not established.",
containmentCycleExists(dataObj));
try {
serializeDataObjectXML(dataObj, scope);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("XML serialization of a containment cycle resulted in a(n) " + e.getClass().getName() + ".");
e.printStackTrace();
}
@@ -597,7 +598,7 @@
try {
serializeDataObjectJava(dataObj);
fail("Java serialization of a containment cycle should result in an IllegalStateException.");
- } catch (Exception e) {
+ } catch (final Exception e) {
// Do nothing. An Exception is expected in this case.
}
@@ -606,7 +607,7 @@
try {
serializeDataObjectStream(dataObj, scope);
- } catch (Exception e) {
+ } catch (final Exception e) {
fail("XMLStreamHelper serialization of a containment cycle resulted in a(n) " + e.getClass().getName() + ".");
e.printStackTrace();
}
@@ -620,14 +621,14 @@
* @param fileName
* @throws IOException
*/
- private static void serializeDataObjectXML(DataObject dataObject, HelperContext scope) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Type type = dataObject.getType();
+ private static void serializeDataObjectXML(final DataObject dataObject, final HelperContext scope) {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final Type type = dataObject.getType();
try {
scope.getXMLHelper().save(dataObject, type.getURI(), type.getName(), baos);
}
- catch (IOException e) {
+ catch (final IOException e) {
fail("Could not complete test case due to IOException.");
}
}
@@ -639,18 +640,18 @@
* @param fileName
* @throws IOException
*/
- private static void serializeDataObjectStream(DataObject dataObject, HelperContext scope) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ private static void serializeDataObjectStream(final DataObject dataObject, final HelperContext scope) {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- XMLOutputFactory factory = XMLOutputFactory.newInstance();
+ final XMLOutputFactory factory = XMLOutputFactory.newInstance();
XMLStreamWriter serializer;
- XMLStreamHelper xmlStreamHelper = SDOUtil.createXMLStreamHelper(scope.getTypeHelper());
+ final XMLStreamHelper xmlStreamHelper = SDOUtil.createXMLStreamHelper(scope);
try {
serializer = factory.createXMLStreamWriter(baos);
xmlStreamHelper.saveObject(dataObject, serializer);
serializer.flush();
}
- catch (XMLStreamException e) {
+ catch (final XMLStreamException e) {
fail("Exception encountered during XMLStreamHelper serialization.");
e.printStackTrace();
}
@@ -663,15 +664,15 @@
* @param fileName
* @throws IOException
*/
- private static void serializeDataObjectJava(DataObject dataObject) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ private static void serializeDataObjectJava(final DataObject dataObject) {
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
try {
- ObjectOutputStream out = new ObjectOutputStream(baos);
+ final ObjectOutputStream out = new ObjectOutputStream(baos);
out.writeObject(dataObject);
out.close();
}
- catch (IOException e) {
+ catch (final IOException e) {
fail("Could not complete test case due to IOException.");
}
}
@@ -682,14 +683,15 @@
* @param root
* @return
*/
- private static boolean containmentCycleExists (DataObject root)
+ private static boolean containmentCycleExists (final DataObject root)
{
DataObject curr = root.getContainer();
while (curr != null)
{
- if (curr == root)
+ if (curr == root) {
return true;
+ }
curr = curr.getContainer();
}
@@ -700,7 +702,7 @@
* Use setDataObject to create a one member containment cycle.
* @param dataObj1
*/
- private void setSingleValueOneMember(DataObject dataObj1) {
+ private void setSingleValueOneMember(final DataObject dataObj1) {
dataObj1.setDataObject("Contain", dataObj1);
}
@@ -710,7 +712,7 @@
* @param dataObj2
* @param dataobj3
*/
- private void setSingleValueNMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
+ private void setSingleValueNMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
dataObj1.setDataObject("Contain", dataObj2);
dataObj2.setDataObject("Contain", dataObj3);
dataObj3.setDataObject("Contain", dataObj1);
@@ -722,8 +724,8 @@
* @param dataObj2
* @param dataObj3
*/
- private void setMultiValueOneMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
- List addList = new ArrayList();
+ private void setMultiValueOneMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
+ final List addList = new ArrayList();
addList.add(dataObj2);
addList.add(dataObj1);
@@ -737,8 +739,8 @@
* @param dataObj2
* @param dataObj3
*/
- private void setManyValueNMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
- List addList = new ArrayList();
+ private void setManyValueNMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
+ final List addList = new ArrayList();
dataObj1.setDataObject("Contain", dataObj2);
dataObj2.setDataObject("Contain", dataObj3);
@@ -750,8 +752,8 @@
* Create a 1-member containment cycle by making updates to a returned List.
* @param dataObj1
*/
- private void returnedListOneMember(DataObject dataObj1) {
- List returnedList = dataObj1.getList("ContainMany");
+ private void returnedListOneMember(final DataObject dataObj1) {
+ final List returnedList = dataObj1.getList("ContainMany");
returnedList.add(dataObj1);
}
@@ -762,11 +764,11 @@
* @param dataObj2
* @param dataobj3
*/
- private void returnedListNMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
+ private void returnedListNMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
dataObj1.setDataObject("Contain", dataObj2);
dataObj2.setDataObject("Contain", dataObj3);
- List returnedList = dataObj3.getList("ContainMany");
+ final List returnedList = dataObj3.getList("ContainMany");
returnedList.add(dataObj1);
}
@@ -778,10 +780,10 @@
* @param dataObj2
* @param dataObj3
*/
- private void sequenceSingleValueOneMember(DataObject dataObj1) {
+ private void sequenceSingleValueOneMember(final DataObject dataObj1) {
assertTrue("DataObject is not Sequenced. Test case may not proceed.", dataObj1.getType().isSequenced());
- Sequence sequence = dataObj1.getSequence();
+ final Sequence sequence = dataObj1.getSequence();
sequence.add("Contain", dataObj1);
}
@@ -793,12 +795,12 @@
* @param dataObj2
* @param dataObj3
*/
- private void sequenceSingleValueNMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
+ private void sequenceSingleValueNMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
assertTrue("DataObject is not Sequenced. Test case may not proceed.", dataObj1.getType().isSequenced());
- Sequence sequence1 = dataObj1.getSequence();
- Sequence sequence2 = dataObj2.getSequence();
- Sequence sequence3 = dataObj3.getSequence();
+ final Sequence sequence1 = dataObj1.getSequence();
+ final Sequence sequence2 = dataObj2.getSequence();
+ final Sequence sequence3 = dataObj3.getSequence();
sequence1.add("Contain", (Object) dataObj2);
sequence2.add("Contain", (Object) dataObj3);
@@ -813,10 +815,10 @@
* @param dataObj2
* @param dataObj3
*/
- private void sequenceMultiValueOneMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
+ private void sequenceMultiValueOneMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
assertTrue("DataObject is not Sequenced. Test case may not proceed.", dataObj1.getType().isSequenced());
- Sequence sequence = dataObj1.getSequence();
+ final Sequence sequence = dataObj1.getSequence();
sequence.add("ContainMany", dataObj2);
sequence.add("ContainMany", dataObj3);
@@ -830,10 +832,10 @@
* @param dataObj2
* @param dataObj3
*/
- private void sequenceManyValueNMember(DataObject dataObj1, DataObject dataObj2, DataObject dataObj3) {
+ private void sequenceManyValueNMember(final DataObject dataObj1, final DataObject dataObj2, final DataObject dataObj3) {
assertTrue("DataObject is not Sequenced. Test case may not proceed.", dataObj1.getType().isSequenced());
- List addList = new ArrayList();
+ final List addList = new ArrayList();
addList.add(dataObj2);
dataObj1.setList("ContainMany", addList);
@@ -842,7 +844,7 @@
addList.add(dataObj3);
dataObj2.setList("ContainMany", addList);
- Sequence sequence = dataObj3.getSequence();
+ final Sequence sequence = dataObj3.getSequence();
sequence.add("ContainMany", dataObj1);
}
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java Thu Jul 19 06:33:32 2007
@@ -28,7 +28,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -73,7 +73,7 @@
public void testCrossScopeCopy() throws IOException
{
- CopyHelper copyHelperB = SDOUtil.createCrossScopeCopyHelper(scopeB);
+ CopyHelper copyHelperB = SDOUtil.createCrossScopeCopyHelper(hcb);
// Perform Shallow Copy Test
DataObject copiedSDO = copyHelperB.copyShallow(bankSDO);
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java Thu Jul 19 06:33:32 2007
@@ -366,7 +366,7 @@
Type stringType = types.getType("commonj.sdo", "String");
// create a new Type for Customers
- Type customerType = SDOUtil.createType(types, "http://example.com/customer", "Customer", false);
+ Type customerType = SDOUtil.createType(hc, "http://example.com/customer", "Customer", false);
// create a customer number property
Property custNumProperty = SDOUtil.createProperty(customerType, "custNum", intType);
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java Thu Jul 19 06:33:32 2007
@@ -25,7 +25,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.DataObject;
import commonj.sdo.Property;
@@ -42,6 +42,7 @@
private final String TEST_NAMESPACE = "http://www.example.com/metadata/retrievaltest";
private final String DYNAMIC_TEST_NAMESPACE = "http://www.example.com/metadata/dynamicmetadata";
+ private HelperContext helperContext;
private TypeHelper typeHelper;
private XSDHelper xsdHelper;
private DataFactory dataFactory;
@@ -141,7 +142,7 @@
{
super.setUp();
- HelperContext helperContext = SDOUtil.createHelperContext();
+ helperContext = SDOUtil.createHelperContext();
typeHelper = helperContext.getTypeHelper();
xsdHelper = helperContext.getXSDHelper();
@@ -201,7 +202,7 @@
public void displayInstanceProperties(String namespace)
{
- List types = SDOUtil.getTypes(typeHelper, namespace);
+ List types = SDOUtil.getTypes(helperContext, namespace);
for (int i = 0; i < types.size(); i++)
{
Type type = (Type)types.get(i);
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java Thu Jul 19 06:33:32 2007
@@ -26,7 +26,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.SDOUtil;
import commonj.sdo.DataGraph;
import commonj.sdo.DataObject;
@@ -115,7 +115,7 @@
byte[] serialized = baos.toByteArray();
ByteArrayInputStream bais = new ByteArrayInputStream(serialized);
- DataGraph loadedDataGraph = SDOUtil.loadDataGraph(bais, null, SDOUtil.createTypeHelper());
+ DataGraph loadedDataGraph = SDOUtil.loadDataGraph(bais, null, hc);
DataObject loadedRootObject = loadedDataGraph.getRootObject();
assertNotSame(loadedRootObject.getType(), customer1.getType());
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java Thu Jul 19 06:33:32 2007
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.xml.namespace.QName;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
@@ -40,7 +39,6 @@
import commonj.sdo.DataObject;
import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
@@ -54,27 +52,27 @@
//SDOUtil->SDOHelper->SDOHelperImpl->HelperContextImpl->XMLHelperImpl
public void testXMLOptionsSchema1() throws IOException{
- String TEST_XML_DOCUMENT = "/SchemaLocationTestCase.xml";
+ final String TEST_XML_DOCUMENT = "/SchemaLocationTestCase.xml";
options = new HashMap();
options.put(SDOHelper.XMLOptions.XML_LOAD_SCHEMA, Boolean.TRUE);
- XMLHelper xmlHelper = SDOUtil.createHelperContext(true, options).getXMLHelper();
+ final XMLHelper xmlHelper = SDOUtil.createHelperContext(true, options).getXMLHelper();
- XMLDocument xmlDoc = xmlHelper.load(getClass().getResourceAsStream(TEST_XML_DOCUMENT), "whatever", null);
- DataObject root = xmlDoc.getRootObject();
+ final XMLDocument xmlDoc = xmlHelper.load(getClass().getResourceAsStream(TEST_XML_DOCUMENT), "whatever", null);
+ final DataObject root = xmlDoc.getRootObject();
assertNotSame(root.getType(), SDOPackage.eINSTANCE.getAnyTypeDataObject());
}
// SDOUtil->SDOHelper->SDOHelperImpl->HelperContextImpl->XMLHelperImpl
public void testXMLOptionsSchema2() throws IOException{
- String TEST_XML_DOCUMENT = "/SchemaLocationTestCase.xml";
+ final String TEST_XML_DOCUMENT = "/SchemaLocationTestCase.xml";
options = new HashMap();
options.put(SDOHelper.XMLOptions.XML_LOAD_SCHEMA, Boolean.FALSE);
- XMLHelper xmlHelper = SDOUtil.createHelperContext(true, options).getXMLHelper();
- XMLDocument xmlDoc = xmlHelper.load(getClass().getResourceAsStream(TEST_XML_DOCUMENT), "whatever", null);
- DataObject root = xmlDoc.getRootObject();
+ final XMLHelper xmlHelper = SDOUtil.createHelperContext(true, options).getXMLHelper();
+ final XMLDocument xmlDoc = xmlHelper.load(getClass().getResourceAsStream(TEST_XML_DOCUMENT), "whatever", null);
+ final DataObject root = xmlDoc.getRootObject();
assertSame(root.getType(), SDOPackage.eINSTANCE.getAnyTypeDataObject());
}
@@ -85,7 +83,7 @@
* tests using this option and bad xml should demonstrate failure to load
*/
options.put(SDOHelper.XMLOptions.XML_LOAD_LAX_FORM, new Integer(0));
- HelperContext hc = SDOUtil.createHelperContext(true, options);
+ final HelperContext hc = SDOUtil.createHelperContext(true, options);
hc.getXSDHelper().define(
"<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" targetNamespace=\"testNS\">"+
"<element name=\"root\">"+
@@ -100,7 +98,7 @@
"</element>"+
"</schema>");
- String xml="<p:root xmlns:p=\"testNS\">"+
+ final String xml="<p:root xmlns:p=\"testNS\">"+
"<p:unqualifiedElement/>"+
"</p:root>";
@@ -111,7 +109,7 @@
try{
hc.getXMLHelper().load(new StringReader(xml), null, null);
fail();
- } catch (Resource.IOWrappedException featureNotFound) {
+ } catch (final Resource.IOWrappedException featureNotFound) {
assertTrue(true);
}
@@ -124,7 +122,7 @@
* tests using this option and bad xml will load
*/
options.put(SDOHelper.XMLOptions.XML_LOAD_LAX_FORM, new Integer(1));
- HelperContext hc = SDOUtil.createHelperContext(true, options);
+ final HelperContext hc = SDOUtil.createHelperContext(true, options);
hc.getXSDHelper().define(
"<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" targetNamespace=\"testNS\">"+
"<element name=\"root\">"+
@@ -139,7 +137,7 @@
"</element>"+
"</schema>");
- String xml="<p:root xmlns:p=\"testNS\" p:unqualifiedAttribute=\"u\" qualifiedAttribute=\"q\">"+
+ final String xml="<p:root xmlns:p=\"testNS\" p:unqualifiedAttribute=\"u\" qualifiedAttribute=\"q\">"+
"<p:unqualifiedElement/>"+
"<qualifiedElement/>"+
"</p:root>";
@@ -158,9 +156,8 @@
* tests using this option and bad xml will load
*/
options.put(SDOHelper.XMLOptions.XML_LOAD_LAX_FORM, new Integer(1));
- HelperContext hc = SDOUtil.createHelperContext(false, options);
- TypeHelper th = hc.getTypeHelper();
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(th, options);
+ final HelperContext hc = SDOUtil.createHelperContext(false, options);
+ final XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(hc);
hc.getXSDHelper().define(
"<schema xmlns=\"http://www.w3.org/2001/XMLSchema\" targetNamespace=\"testNS\">"+
"<element name=\"root\">"+
@@ -175,18 +172,18 @@
"</element>"+
"</schema>");
- String xml="<p:root xmlns:p=\"testNS\" p:unqualifiedAttribute=\"u\" qualifiedAttribute=\"q\">"+
+ final String xml="<p:root xmlns:p=\"testNS\" p:unqualifiedAttribute=\"u\" qualifiedAttribute=\"q\">"+
"<p:unqualifiedElement/>"+
"<qualifiedElement/>"+
"</p:root>";
- XMLInputFactory inputFactory = XMLInputFactory.newInstance();
- XMLStreamReader reader1 = inputFactory.createXMLStreamReader(new StringReader(xml));
+ final XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+ final XMLStreamReader reader1 = inputFactory.createXMLStreamReader(new StringReader(xml));
int event = reader1.getEventType();
while (!(event == XMLStreamConstants.START_ELEMENT)){
event = reader1.next();
}
- DataObject dataObject = streamHelper.loadObject(reader1);
+ final DataObject dataObject = streamHelper.loadObject(reader1);
/*
* this malformed xml will load, as lax is forced ON
*/
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java Thu Jul 19 06:33:32 2007
@@ -36,7 +36,6 @@
import org.apache.tuscany.sdo.api.XMLStreamHelper;
import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
import commonj.sdo.helper.XMLDocument;
import commonj.sdo.helper.XMLHelper;
import commonj.sdo.helper.XSDHelper;
@@ -89,9 +88,9 @@
MARGIN+INDENT+"<change1>1000.0</change1>" +LINE_BREAK+
MARGIN+"</p0:stockQuote>" +LINE_BREAK;
- void define(String model) throws IOException {
+ void define(final String model) throws IOException {
// Populate the meta data for the test model
- URL url = getClass().getResource(model);
+ final URL url = getClass().getResource(model);
xsdHelper.define(url.openStream(), url.toString());
}
@@ -105,7 +104,7 @@
//use XMLHelper
public void testSaveXMLDocumentXMLHelper() throws IOException {
- HashMap options = new HashMap();
+ final HashMap options = new HashMap();
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_INDENT, INDENT);
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_MARGIN, MARGIN);
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK, LINE_BREAK);
@@ -115,32 +114,31 @@
// Populate the meta data for the test (Stock Quote) model
define("/simpleWithChangeSummary.xsd");
- XMLDocument doc = xmlh.load(getClass().getResource("/simpleWithChangeSummary.xml").openStream());
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final XMLDocument doc = xmlh.load(getClass().getResource("/simpleWithChangeSummary.xml").openStream());
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
xmlh.save(xmlh.createDocument(doc.getRootObject(), doc.getRootElementURI(), doc.getRootElementName()), baos, null);
assertEquals(formatted1, baos.toString());
}
//use XMLStreamHelper
public void testSaveXMLDocumentXMLStreamHelper() throws Exception {
- HashMap options = new HashMap();
+ final HashMap options = new HashMap();
options.put(SDOHelper.XMLOptions.XML_LOAD_SCHEMA, Boolean.FALSE);
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_INDENT, INDENT);
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_MARGIN, MARGIN);
options.put(org.apache.tuscany.sdo.api.SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK, LINE_BREAK);
- HelperContext hc = SDOUtil.createHelperContext(false, options);
- TypeHelper th = hc.getTypeHelper();
- xmlStreamHelper = SDOUtil.createXMLStreamHelper(th, options); //both load and save options passed at same time
+ final HelperContext hc = SDOUtil.createHelperContext(false, options);
+ xmlStreamHelper = SDOUtil.createXMLStreamHelper(hc);
xsdHelper = hc.getXSDHelper();
define("/simple.xsd");
- InputStream inStrm = getClass().getResourceAsStream("/shallowquote.xml");
- XMLDocument document = hc.getXMLHelper().load(inStrm, null, null);
+ final InputStream inStrm = getClass().getResourceAsStream("/shallowquote.xml");
+ final XMLDocument document = hc.getXMLHelper().load(inStrm, null, null);
- XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- StringWriter writer = new StringWriter();
- XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+ final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+ final StringWriter writer = new StringWriter();
+ final XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
xmlStreamHelper.save(document, streamWriter, null);
streamWriter.flush();
Modified: incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java?view=diff&rev=557615&r1=557614&r2=557615
==============================================================================
--- incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java (original)
+++ incubator/tuscany/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java Thu Jul 19 06:33:32 2007
@@ -26,8 +26,8 @@
import javax.xml.stream.*;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.util.SDOUtil;
+import org.apache.tuscany.sdo.api.XMLStreamHelper;
+import org.apache.tuscany.sdo.api.SDOUtil;
import junit.framework.TestCase;
@@ -45,9 +45,9 @@
* Simple Dynamic SDO 2 test.
*/
public void testDynamic() throws Exception {
- TypeHelper typeHelper = hc.getTypeHelper();
- Type quoteType = typeHelper.getType(TEST_NAMESPACE, "Quote");
- DataObject quote = hc.getDataFactory().create(quoteType);
+ final TypeHelper typeHelper = hc.getTypeHelper();
+ final Type quoteType = typeHelper.getType(TEST_NAMESPACE, "Quote");
+ final DataObject quote = hc.getDataFactory().create(quoteType);
quote.setString("symbol", "fbnt");
quote.setString("companyName", "FlyByNightTechnology");
@@ -58,19 +58,19 @@
quote.setDouble("volume", 1000);
quote.setDouble("change1", 1000);
- DataObject child = quote.createDataObject("quotes");
+ final DataObject child = quote.createDataObject("quotes");
child.setBigDecimal("price", new BigDecimal("2000.0"));
- DataObject quote3 = quote.createDataObject("quotes3");
+ final DataObject quote3 = quote.createDataObject("quotes3");
quote3.setString("symbol3", "IBM");
quote3.setString("company3", "IBM Corp.");
- XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(typeHelper);
- XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
- StringWriter writer = new StringWriter();
- XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
+ final XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(hc);
+ final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+ final StringWriter writer = new StringWriter();
+ final XMLStreamWriter streamWriter = outputFactory.createXMLStreamWriter(writer);
- XMLDocument doc = hc.getXMLHelper().createDocument(quote, TEST_NAMESPACE, "stockQuote");
+ final XMLDocument doc = hc.getXMLHelper().createDocument(quote, TEST_NAMESPACE, "stockQuote");
streamHelper.save(doc, streamWriter);
streamWriter.flush();
assertEquals("<p0:stockQuote xmlns:p0=\"http://www.example.com/simple\" xmlns:p1=\"http://www.example.com/simple3\"><p0:symbol>fbnt</p0:symbol><p0:companyName>FlyByNightTechnology</p0:companyName><p0:price>1000.0</p0:price><p0:open1>1000.0</p0:open1><p0:high>1000.0</p0:high><p0:low>1000.0</p0:low><p0:volume>1000.0</p0:volume><p0:change1>1000.0</p0:change1><p0:quotes><p0:price>2000.0</p0:price></p0:quotes><p0:quotes3><p1:symbol3>IBM</p1:symbol3><p1:company3>IBM Corp.</p1:company3></p0:quotes3></p0:stockQuote>",writer.toString());
@@ -81,8 +81,8 @@
hc = SDOUtil.createHelperContext();
// Populate the meta data for the test (Stock Quote) model
- URL url = getClass().getResource(TEST_MODEL);
- InputStream inputStream = url.openStream();
+ final URL url = getClass().getResource(TEST_MODEL);
+ final InputStream inputStream = url.openStream();
hc.getXSDHelper().define(inputStream, url.toString());
inputStream.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org